diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml
index 689ac617..3e700598 100644
--- a/archetypes/alfresco-allinone-archetype/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/pom.xml
@@ -38,6 +38,7 @@
             <filtering>false</filtering>
         </resource>
     </resources>
+
      <plugins>
         <plugin>
             <artifactId>maven-resources-plugin</artifactId>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 8f00d4d7..48bd1196 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -52,12 +52,6 @@
             <include>**/*.properties</include>
           </includes>
         </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>tomcat</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
       </fileSets>
     </module>
 
@@ -87,18 +81,6 @@
             <include>**</include>
           </includes>
         </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/test/properties</directory>
-          <includes>
-            <include>**/*.properties</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>tomcat</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
       </fileSets>
     </module>
     
@@ -124,12 +106,6 @@
     
     <module id="share" dir="share" name="share" filtered="false">
       <fileSets>
-        <fileSet encoding="UTF-8">
-          <directory>src/main/properties</directory>
-          <includes>
-            <include>**/*.properties</include>
-          </includes>
-        </fileSet>
         <fileSet encoding="UTF-8" filtered="false">
           <directory>src/main/resources</directory>
           <includes>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
index 33287af3..186cddbc 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,60 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
     <name>Alfresco Repository and Share Quickstart with database and an embedded runner.</name>
-    <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr, AMPs) in one project</description>
-    <packaging>pom</packaging>    
+    <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo,
+        Share, Solr4, AMPs) in one project
+    </description>
+    <packaging>pom</packaging>
 
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-parent</artifactId>
         <version>@@alfresco.sdk.parent.version@@</version>
     </parent>
-    
+
     <!-- 
-       | SDK properties have sensible defaults in the SDK parent, but you can override the properties below to use another version. 
-       | For more available properties see the alfresco-sdk-parent POM. 
+       SDK properties have sensible defaults in the SDK parent,
+       but you can override the properties below to use another version.
+       For more available properties see the alfresco-sdk-parent POM.
        -->
     <properties>
-        <!-- 
-            | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco
-            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details
-        -->
-        <!-- <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId> -->
-        <!-- Defines the Alfresco version to work against.
-             Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0) 
-        -->
-        <!--<alfresco.version>${alfresco_target_version}</alfresco.version>-->
+        <!-- The following are default values for data location and Alfresco version.
+             Uncomment if you need to change -->
+        <!-- <alfresco.version>${alfresco_target_version}</alfresco.version>-->
+        <!-- <alfresco.data.location>${alfresco.data.location}</alfresco.data.location> -->
+
         <!-- This control the root logging level for all apps -->
         <app.log.root.level>WARN</app.log.root.level>
-        <!-- This controls the default data location for dir.root -->
-        <alfresco.data.location>alf_data_dev</alfresco.data.location>
+
         <!-- This controls which properties will be picked in multi-enviromment build -->
         <env>local</env>
     </properties>
 
-   <!-- Here we realize the connection with the Alfresco selected platform (e.g.version and edition) -->
-   <dependencyManagement>
-     <dependencies>
-          <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco plaftorm
-               (see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies)
-               NOTE: You still need to define dependencies in your POM, but you can omit version as it's enforced by this dependencyManagement.
-               NOTE: It defaults to the latest version this SDK pom has been tested with, but alfresco version can/should be overridden in your project's pom   
-           -->
-          <dependency>
-              <groupId>${alfresco.groupId}</groupId>
-              <artifactId>alfresco-platform-distribution</artifactId>
-              <version>${alfresco.version}</version>
-              <type>pom</type>
-              <scope>import</scope>
-          </dependency>
-     </dependencies>
-  </dependencyManagement>
+    <!-- Here we realize the connection with the Alfresco selected platform (e.g.version and edition) -->
+    <dependencyManagement>
+        <dependencies>
+            <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco plaftorm
+                 (see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies)
+                 NOTE: You still need to define dependencies in your POM, but you can omit version as it's enforced by this dependencyManagement.
+                 NOTE: It defaults to the latest version this SDK pom has been tested with, but alfresco version can/should be overridden in your project's pom
+             -->
+            <dependency>
+                <groupId>${alfresco.groupId}</groupId>
+                <artifactId>alfresco-platform-distribution</artifactId>
+                <version>${alfresco.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-    <!-- Invoke your build with -Prun to run the multimodule project and enable rapid dev mode in your IDE. 
+    <build>
+        <plugins>
+            <!-- Compress JavaScript files and store as *-min.js -->
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <version>1.5.1</version>
+                <configuration>
+                    <excludes>
+                        <exclude>alfresco/**/*.*</exclude>
+                        <exclude>**/*-min.js</exclude>
+                        <exclude>**/*.css</exclude>
+                    </excludes>
+                    <resources/>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>compress-js</id>
+                        <goals>
+                            <goal>compress</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- Invoke your build with -Prun to run the multimodule project and enable rapid dev mode in your IDE.
          See 'run' profile in the sub modules pom.xml for further behavioral details.
      -->
     <profiles>
@@ -67,15 +93,15 @@
                 <maven.alfresco.includeWebResources>false</maven.alfresco.includeWebResources>
             </properties>
         </profile>
-         <!-- RM profile, manually activated, automatically adds support for RM development (dependencies) and install the RM amps in the WARs -->
+        <!-- RM profile, manually activated, automatically adds support for RM development (dependencies) and install the RM amps in the WARs -->
         <profile>
             <id>rm</id>
-             <properties>
+            <properties>
                 <alfresco.rm.version>2.3.a.1</alfresco.rm.version>
                 <app.rm.amps.location>${project.build.directory}/rm-amps</app.rm.amps.location>
                 <app.rm.war.location>${project.build.directory}/${project.build.finalName}.war</app.rm.war.location>
                 <app.rm.artifact>org.alfresco:${alfresco.rm.artifactId}:${alfresco.rm.version}:amp</app.rm.artifact>
-             </properties>
+            </properties>
         </profile>
     </profiles>
 </project>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
index 1c78f06f..7d67d6e8 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
@@ -13,26 +13,38 @@
     </parent>
     
     <properties>
-        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
-        .    | Allowed values: alfresco | share. Defaults to a repository AMP, but could point to your custom corporate Alfresco WAR -->
-        <alfresco.client.war>alfresco</alfresco.client.war>
+        <!-- Property overrides are mostly done in parent pom -->
     </properties>
 
-    <!--
-    Following dependencies are needed for compiling Java code in src/main/java; <scope>provided</scope>
-    is inherited for each of the following; for more info, please refer to alfresco-integration-parent
-    POM definition
-    @TODO - document
-    -->
+    <!-- Following dependencies are needed for compiling Java code in src/main/java;
+          <scope>provided</scope> is inherited for each of the following;
+          for more info, please refer to alfresco-platform-distribution POM -->
     <dependencies>
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-repository</artifactId>
         </dependency>
     </dependencies>
-    
+
     <profiles>
-        <!-- RM profile, manually activated, automatically adds support for RM development (dependencies) and install the RM amps in the WARs -->
+
+        <!--
+            Brings in the extra Enterprise specific repository classes,
+            if the 'enterprise' profile has been activated, needs to be activated manually. -->
+        <profile>
+            <id>enterprise</id>
+            <dependencies>
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>alfresco-enterprise-repository</artifactId>
+                    <version>${alfresco.version}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <!-- RM profile, manually activated, automatically adds support for RM development
+             (dependencies) and install the RM amps in the WARs -->
         <profile>
             <id>rm</id>
             <dependencies>
@@ -45,23 +57,12 @@
                 </dependency>
             </dependencies>
         </profile>
-		<!-- Enterprise profile, manually activated, automatically adds support for Enterprise edition development (dependencies) -->
-        <profile>
-            <id>enterprise</id>
-            <dependencies>
-                <dependency>
-                    <groupId>${alfresco.groupId}</groupId>
-                    <artifactId>alfresco-enterprise-repository</artifactId>
-                    <version>${alfresco.version}</version>
-                    <type>jar</type>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
+
+        <!-- If we are running embedded skip unit tests -->
         <profile>
             <id>run</id>
             <properties>
-            	<skipTests>true</skipTests>
+                <skipTests>true</skipTests>
             </properties>
         </profile>
     </profiles>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh
deleted file mode 100644
index fc86774c..00000000
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Downloads the spring-loaded lib if not existing and runs the repository AMP
-springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar
-
-if [ ! -f $springloadedfile ]; then
-mvn validate -Psetup
-fi
-
-MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Prun
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties
new file mode 100644
index 00000000..390d68a0
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties
@@ -0,0 +1,5 @@
+## This Alfresco Repo Configuration file should be used for custom properties that are introduced by this module.
+## Define default values for all properties here.
+## System Administrators can override these values in environment specific configurations in
+## alfresco/tomcat/shared/classes/alfresco-global.properties.
+##
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
new file mode 100644
index 00000000..e5421cc0
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <!-- The bootstrap-context.xml file is used for patch definitions, importers, 
+		 workflow, and loading custom content models.  -->
+
+
+    <!-- Registration of new models -->
+    <bean id="com.mycompany.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+        <property name="models">
+            <list>
+                <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>
+                <value>alfresco/module/${project.artifactId}/model/workflow-model.xml</value>
+
+            </list>
+        </property>
+    </bean>
+	
+
+
+</beans>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml
new file mode 100644
index 00000000..91f54ae6
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="myc:contentModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+    <!-- Optional meta-data about the model -->
+    <description>Document Model for Repo Extension X</description>
+    <author>My Name</author>
+    <version>1.0</version>
+
+    <imports>
+        <!-- Import Alfresco Dictionary Definitions -->
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <!-- Import Alfresco Content Domain Model Definitions -->
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+        <!-- Import Alfresco System Model Definitions -->
+        <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
+    </imports>
+
+    <!-- Custom namespace for your domain -->
+    <namespaces>
+        <namespace uri="http://www.mycompany.com/model/content/1.0" prefix="myc"/>
+    </namespaces>
+
+    <!-- ===============================================================================================================
+        Constraints, Types, and Aspects go here...
+        -->
+
+</model>
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml
new file mode 100644
index 00000000..580e3f20
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="myw:workflowModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+    <!-- Optional meta-data about the model -->
+    <description>Workflow Model for Repo Extension X</description>
+    <author>My Name</author>
+    <version>1.0</version>
+
+    <imports>
+        <!-- Import Alfresco Dictionary Definitions -->
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <!-- Import Alfresco Content Domain Model Definitions -->
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+        <!-- Import Alfresco Workflow Model Definitions -->
+        <import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/>
+    </imports>
+
+    <!-- Custom namespace for your domain -->
+    <namespaces>
+        <namespace uri="http://www.mycompany.com/model/workflow/1.0" prefix="myw"/>
+    </namespaces>
+
+    <!-- ===============================================================================================================
+        Constraints, Types, and Aspects go here...
+        -->
+</model>
+
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml
index 2111526d..bc5b538f 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml
@@ -15,11 +15,13 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 	
--->
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-	
-    <import resource="classpath:alfresco/module/${artifactId}/context/service-context.xml" />
-    
-</beans>
+-->
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+
+    <!-- This is filtered by Maven at build time, so that module name is single sourced. -->
+    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
+    <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
+
+</beans>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml
deleted file mode 100644
index 68747908..00000000
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is included only when running this project with -Pamp-to-war -->
-<Context docBase="${alfresco.client.war.folder}" path="${alfresco.client.contextPath}">
-
-
-  <Resources className="org.apache.naming.resources.VirtualDirContext"
-    extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
-    
-     
-    <Loader searchVirtualFirst="true" className="org.apache.catalina.loader.VirtualWebappLoader"
-    virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
-  
-  <!-- 
-  <Environment override="false" type="java.lang.Boolean" name="properties/startup.enable" description="A flag that globally enables or disables startup of the major Alfresco subsystems." value="true"/>
-  <Environment override="false" type="java.lang.String" name="properties/dir.root" description="The filesystem directory below which content and index data is stored. Should be on a shared disk if this is a clustered installation."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.dialect" 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"/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.query.substitutions" description="Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to &quot;true TRUE, false FALSE&quot;."/>
-  <Environment override="false" type="java.lang.Boolean" name="properties/hibernate.jdbc.use_get_generated_keys" 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."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.default_schema" 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."/>
-   -->
-   
-  <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources --> 
-  <JarScanner scanAllDirectories="true" />
-  
-</Context>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
index 6b689205..7b17ad14 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
@@ -113,6 +113,7 @@
                 </plugins>
             </build>
         </profile>
+
         <!-- Runs regression tests using Alfresco Share PO (Page Object) vanilla Selenium / Webdrone driven functional test, during integration-test phase. 
              NOTE: Assumes an already running Alfresco + Share at the default location ${app.share.url} (e.g. by invoking -Prun,regression) -->
         <profile>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml
index 94d11adb..95b83dd4 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml
@@ -1,14 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This context file is used only for rapid development, never installed released with the webapp -->
-<Context>
-    
-    <Resources className="org.apache.naming.resources.VirtualDirContext" extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" />
+<!-- ===================================================================================================================
+    This context file is used only in a development IDE for rapid development,
+    it is never released with the Alfresco.war
+
+    IMPORTANT: If an AMP or JAR extension is added to the Alfresco WAR,
+              then you need to add the paths below for this new extension.
+    =================================================================================================================-->
+
+<!-- Pick up static resource files from ../repo/target/repo.
+     The Alfresco.war 5.0 does not have a webapp (it used to have Alfresco Explorer but not anymore)
+     that we will access, so this docBase might not be needed -->
+<Context docBase="${project.parent.basedir}/alfresco-war/target/${project.build.finalName}">
+    <!-- Pick up static resource files from AMPs and other directories (this should not include docBase) -->
+    <Resources className="org.apache.naming.resources.VirtualDirContext"
+               extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" />
+
+    <!-- Configure where the Alfresco (alfresco.war) web application can load classes, test classes, and config files -->
     <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
-        searchVirtualFirst="true"
-        virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;${project.parent.basedir}/repo-amp/target/test-classes;${project.parent.basedir}/repo-amp/target/repo-amp/config" />
-        
-    <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources --> 
-    <JarScanner scanAllDirectories="true" />    
+            searchVirtualFirst="true"
+            virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;${project.parent.basedir}/repo-amp/target/test-classes;${project.parent.basedir}/repo-amp/target/repo-amp/config" />
+
+    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
+    <JarScanner scanAllDirectories="true" />
 </Context>
-    
+
+
     
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml
index 2db50103..65d1c488 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml
@@ -1,13 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This context file is used only for rapid development, never installed released with the webapp -->
-<Context docBase="../share/target/share">
-    
-    <Resources className="org.apache.naming.resources.VirtualDirContext" extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
+<!-- ===================================================================================================================
+    This context file is used only in a development IDE for rapid development,
+    it is never released with the Share.war
+
+    IMPORTANT: If an AMP or JAR extension is added to the Share WAR,
+               then you need to add the paths below for this new extension.
+=================================================================================================================-->
+<Context>
+    <!-- Pick up static resource files from any Share extensions, being it a JAR or an AMP
+         (this should not include docBase) -->
+    <Resources className="org.apache.naming.resources.VirtualDirContext"
+               extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
+
+    <!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
     <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
-        searchVirtualFirst="true"
-        virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/test-classes;${project.parent.basedir}/share-amp/target/share-amp/config" />
-        
-    <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources --> 
+            searchVirtualFirst="true"
+            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/test-classes;${project.parent.basedir}/share-amp/target/share-amp/config" />
+
+    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
     <JarScanner scanAllDirectories="true" />
-     
-</Context>
\ No newline at end of file
+</Context>
+
+
+
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
index 3edf8628..6b793919 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
     <name>Alfresco Share AMP Module</name>
@@ -33,7 +33,6 @@
         <app.log.root.level>WARN</app.log.root.level>
     </properties>
 
-   
     <!-- Following dependencies are needed for compiling Java code in src/main/java; 
          <scope>provided</scope> is inherited for each of the following; 
          for more info, please refer to alfresco-platform-distribution POM -->
@@ -47,10 +46,10 @@
         </dependency>
 
         <dependency>
-          <groupId>org.springframework.extensions.surf</groupId>
-          <artifactId>spring-surf-api</artifactId>
-          <scope>provided</scope>
-        </dependency>        
+            <groupId>org.springframework.extensions.surf</groupId>
+            <artifactId>spring-surf-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh
deleted file mode 100644
index ab528413..00000000
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Downloads the spring-loaded lib if not existing and runs the share AMP
-springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar
-
-if [ ! -f $springloadedfile ]; then
-mvn validate -Psetup
-fi
-
-MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/messages/custom.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/messages/custom.properties
new file mode 100644
index 00000000..602ae4ed
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/messages/custom.properties
@@ -0,0 +1,9 @@
+# This file should contain messages and labels specific to this share extension
+# Put here things like:
+#   Content Model Aspect and Type Labels
+#   Form field labels
+#   Doc lib Action labels and messages
+#   Doc Lib Action Forms labels
+#
+
+
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/example-widgets.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-data/extensions/example-widgets.xml
similarity index 100%
rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/example-widgets.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-data/extensions/example-widgets.xml
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.desc.xml
similarity index 100%
rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.desc.xml
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.html.ftl
similarity index 100%
rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.html.ftl
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.js
similarity index 100%
rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.js
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample
new file mode 100644
index 00000000..86d652b9
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:hz="http://www.hazelcast.com/schema/spring"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                http://www.hazelcast.com/schema/spring
+                http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.xsd">
+   
+   <!--
+    Define beans related to this Share extension here, such as
+     evaluators and resource bootstrapping.
+
+     Note. Any configuration related to the whole Share.war webapp
+           (i.e. not specific to this share extension) should be
+            placed in the alfresco-allinone/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml file
+   -->
+
+   <!-- Add extension specific messages and labels -->
+   <bean id="com.mycompany.share-amp.resources"
+         class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.messages.custom</value>
+         </list>
+      </property>
+   </bean>
+
+</beans>
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md
new file mode 100644
index 00000000..c6018967
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md
@@ -0,0 +1,4 @@
+## If you are overriding existing pages/components put these extension modules here.
+## If you are defining new extensions add them under resources/alfresco/site-data.
+##
+
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md
new file mode 100644
index 00000000..a6b158d2
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md
@@ -0,0 +1,4 @@
+## If you are overriding out-of-the-box Alfresco web scripts put these files here.
+## If you are defining new web scripts add them under resources/alfresco/site-webscripts.
+##
+
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample
index 7a292745..80ab7590 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample
@@ -1,422 +1,14 @@
+<!-- Share configuration related to this particular Share module extension, such as:
+     - Doclib action config
+     - Form config
+     - Aspect and Type config
+
+    Note. Any configuration related to the whole Share.war webapp
+           (i.e. not specific to this share extension) should be
+            placed in the environment specific config:
+             alfresco-allinone/share/src/main/resources/alfresco/web-extension/share-config-custom.xml file
+     -->
 <alfresco-config>
 
-   <!-- Global config section -->
-   <config replace="true">
-      <flags>
-         <!--
-            Developer debugging setting to turn on DEBUG mode for client scripts in the browser
-         -->
-         <client-debug>false</client-debug>
 
-         <!--
-            LOGGING can always be toggled at runtime when in DEBUG mode (Ctrl, Ctrl, Shift, Shift).
-            This flag automatically activates logging on page load.
-         -->
-         <client-debug-autologging>false</client-debug-autologging>
-      </flags>
-   </config>
-   
-   <config evaluator="string-compare" condition="WebFramework">
-      <web-framework>
-         <!-- SpringSurf Autowire Runtime Settings -->
-         <!-- 
-              Developers can set mode to 'development' to disable; SpringSurf caches,
-              FreeMarker template caching and Rhino JavaScript compilation.
-         -->
-         <autowire>
-            <!-- Pick the mode: "production" or "development" -->
-            <mode>production</mode>
-         </autowire>
-
-         <!-- Allows extension modules with <auto-deploy> set to true to be automatically deployed -->
-         <module-deployment>
-            <mode>manual</mode>
-            <enable-auto-deploy-modules>true</enable-auto-deploy-modules>
-         </module-deployment>
-      </web-framework>
-   </config>
-
-   <!-- Disable the CSRF Token Filter -->
-   <!--
-   <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-      <filter/>
-   </config>
-   -->
-
-   <!--
-      To run the CSRF Token Filter behind 1 or more proxies that do not rewrite the Origin or Referere headers:
-
-      1. Copy the "CSRFPolicy" default config in share-security-config.xml and paste it into this file.
-      2. Replace the old config by setting the <config> element's "replace" attribute to "true" like below:
-         <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-      3. To every <action name="assertReferer"> element add the following child element
-         <param name="referer">http://www.proxy1.com/.*|http://www.proxy2.com/.*</param>
-      4. To every <action name="assertOrigin"> element add the following child element
-         <param name="origin">http://www.proxy1.com|http://www.proxy2.com</param>
-   -->
-
-   <!--
-      Remove the default wildcard setting and use instead a strict whitelist of the only domains that shall be allowed
-      to be used inside iframes (i.e. in the WebView dashlet on the dashboards)
-   -->
-   <!--
-   <config evaluator="string-compare" condition="IFramePolicy" replace="true">
-      <cross-domain>
-         <url>http://www.trusted-domain-1.com/</url>
-         <url>http://www.trusted-domain-2.com/</url>
-      </cross-domain>
-   </config>
-   -->
-
-   <!-- Turn off header that stops Share from being displayed in iframes on pages from other domains -->
-   <!--
-   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
-      <headers>
-         <header>
-            <name>X-Frame-Options</name>
-            <enabled>false</enabled>
-         </header>
-      </headers>
-   </config>
-   -->
-
-   <!-- Prevent browser communication over HTTP (for HTTPS servers) -->
-   <!--
-   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
-      <headers>
-         <header>
-            <name>Strict-Transport-Security</name>
-            <value>max-age=31536000</value>
-         </header>
-      </headers>
-   </config>
-   -->
-
-   <config evaluator="string-compare" condition="Replication">
-      <share-urls>
-         <!--
-            To discover a Repository Id, browse to the remote server's CMIS landing page at:
-              http://{server}:{port}/alfresco/service/cmis/index.html
-            The Repository Id field is found under the "CMIS Repository Information" expandable panel.
-
-            Example config entry:
-              <share-url repositoryId="622f9533-2a1e-48fe-af4e-ee9e41667ea4">http://new-york-office:8080/share/</share-url>
-         -->
-      </share-urls>
-   </config>
-
-   <!-- Document Library config section -->
-   <config evaluator="string-compare" condition="DocumentLibrary" replace="true">
-
-      <tree>
-         <!--
-            Whether the folder Tree component should enumerate child folders or not.
-            This is a relatively expensive operation, so should be set to "false" for Repositories with broad folder structures.
-         -->
-         <evaluate-child-folders>false</evaluate-child-folders>
-         
-         <!--
-            Optionally limit the number of folders shown in treeview throughout Share.
-         -->
-         <maximum-folder-count>1000</maximum-folder-count>
-         
-         <!--  
-            Default timeout in milliseconds for folder Tree component to recieve response from Repository
-         -->
-         <timeout>7000</timeout>
-      </tree>
-
-      <!--
-         Used by the "Manage Aspects" action
-
-         For custom aspects, remember to also add the relevant i18n string(s)
-            cm_myaspect=My Aspect
-      -->
-      <aspects>
-         <!-- Aspects that a user can see -->
-         <visible>
-            <aspect name="cm:generalclassifiable" />
-            <aspect name="cm:complianceable" />
-            <aspect name="cm:dublincore" />
-            <aspect name="cm:effectivity" />
-            <aspect name="cm:summarizable" />
-            <aspect name="cm:versionable" />
-            <aspect name="cm:templatable" />
-            <aspect name="cm:emailed" />
-            <aspect name="emailserver:aliasable" />
-            <aspect name="cm:taggable" />
-            <aspect name="app:inlineeditable" />
-            <aspect name="gd:googleEditable" />
-            <aspect name="cm:geographic" />
-            <aspect name="exif:exif" />
-            <aspect name="audio:audio" />
-            <aspect name="cm:indexControl" />
-            <aspect name="dp:restrictable" />
-         </visible>
-
-         <!-- Aspects that a user can add. Same as "visible" if left empty -->
-         <addable>
-         </addable>
-
-         <!-- Aspects that a user can remove. Same as "visible" if left empty -->
-         <removeable>
-         </removeable>
-      </aspects>
-
-      <!--
-         Used by the "Change Type" action
-
-         Define valid subtypes using the following example:
-            <type name="cm:content">
-               <subtype name="cm:mysubtype" />
-            </type>
-
-         Remember to also add the relevant i18n string(s):
-            cm_mysubtype=My SubType
-      -->
-      <types>
-         <type name="cm:content">
-         </type>
-
-         <type name="cm:folder">
-         </type>
- 
-         <type name="trx:transferTarget">
-            <subtype name="trx:fileTransferTarget" />
-         </type>
-      </types>
-
-      <!--
-         If set, will present a WebDAV link for the current item on the Document and Folder details pages.
-         Also used to generate the "View in Alfresco Explorer" action for folders.
-      -->
-      <repository-url>http://localhost:8080/alfresco</repository-url>
-
-      <!--
-         Google Docs integration
-      -->
-      <google-docs>
-         <!--
-            Enable/disable the Google Docs UI integration (Extra types on Create Content menu, Google Docs actions).
-         -->
-         <enabled>false</enabled>
-
-         <!--
-            The mimetypes of documents Google Docs allows you to create via the Share interface.
-            The I18N label is created from the "type" attribute, e.g. google-docs.doc=Google Docs&trade; Document
-         -->
-         <creatable-types>
-            <creatable type="doc">application/msword</creatable>
-            <creatable type="xls">application/vnd.ms-excel</creatable>
-            <creatable type="ppt">application/vnd.ms-powerpoint</creatable>
-         </creatable-types>
-      </google-docs>
-
-      <!--
-         File upload configuration
-      -->
-      <file-upload>
-         <!--
-            Adobe Flash™
-            In certain environments, an HTTP request originating from Flash cannot be authenticated using an existing session.
-            See: http://bugs.adobe.com/jira/browse/FP-4830
-            For these cases, it is useful to disable the Flash-based uploader for Share Document Libraries.
-         -->
-         <adobe-flash-enabled>true</adobe-flash-enabled>
-      </file-upload>
-   </config>
-
-
-   <!-- Custom DocLibActions config section -->
-   <config evaluator="string-compare" condition="DocLibActions">
-      <actionGroups>
-         <actionGroup id="document-browse">
-
-            <!-- Simple Repo Actions -->
-            <!--
-            <action index="340" id="document-extract-metadata" />
-            <action index="350" id="document-increment-counter" />
-            -->
-
-            <!-- Dialog Repo Actions -->
-            <!--
-            <action index="360" id="document-transform" />
-            <action index="370" id="document-transform-image" />
-            <action index="380" id="document-execute-script" />
-            -->
-
-         </actionGroup>
-      </actionGroups>
-   </config>
-
-   <!-- Global folder picker config section -->
-   <config evaluator="string-compare" condition="GlobalFolder">
-      <siteTree>
-         <container type="cm:folder">
-            <!-- Use a specific label for this container type in the tree -->
-            <rootLabel>location.path.documents</rootLabel>
-            <!-- Use a specific uri to retreive the child nodes for this container type in the tree -->
-            <uri>slingshot/doclib/treenode/site/{site}/{container}{path}?children={evaluateChildFoldersSite}&amp;max={maximumFolderCountSite}</uri>
-         </container>
-      </siteTree>
-   </config>
-
-   <!-- Repository Library config section -->
-   <config evaluator="string-compare" condition="RepositoryLibrary" replace="true">
-      <!--
-         Root nodeRef or xpath expression for top-level folder.
-         e.g. alfresco://user/home, /app:company_home/st:sites/cm:site1
-         If using an xpath expression, ensure it is properly ISO9075 encoded here.
-      -->
-      <root-node>alfresco://company/home</root-node>
-
-      <tree>
-         <!--
-            Whether the folder Tree component should enumerate child folders or not.
-            This is a relatively expensive operation, so should be set to "false" for Repositories with broad folder structures.
-         -->
-         <evaluate-child-folders>false</evaluate-child-folders>
-         
-         <!--
-            Optionally limit the number of folders shown in treeview throughout Share.
-         -->
-         <maximum-folder-count>500</maximum-folder-count>
-      </tree>
-
-      <!--
-         Whether the link to the Repository Library appears in the header component or not.
-      -->
-      <visible>true</visible>
-   </config>
-   
-   <!-- Kerberos settings -->
-   <!-- To enable kerberos rename this condition to "Kerberos" -->
-   <config evaluator="string-compare" condition="KerberosDisabled" replace="true">
-      <kerberos>
-         <!--
-            Password for HTTP service account.
-            The account name *must* be built from the HTTP server name, in the format :
-               HTTP/<server_name>@<realm>
-            (NB this is because the web browser requests an ST for the
-            HTTP/<server_name> principal in the current realm, so if we're to decode
-            that ST, it has to match.)
-         -->
-         <password>secret</password>
-         <!--
-            Kerberos realm and KDC address.
-         -->
-         <realm>ALFRESCO.ORG</realm>
-         <!--
-            Service Principal Name to use on the repository tier.
-            This must be like: HTTP/host.name@REALM
-         -->
-         <endpoint-spn>HTTP/repository.server.com@ALFRESCO.ORG</endpoint-spn>
-         <!--
-            JAAS login configuration entry name.
-         -->
-         <config-entry>ShareHTTP</config-entry>
-      </kerberos>
-   </config>
-
-   <!-- Uncomment and modify the URL to Activiti Admin Console if required. -->
-   <!--
-   <config evaluator="string-compare" condition="ActivitiAdmin" replace="true">
-      <activiti-admin-url>http://localhost:8080/alfresco/activiti-admin</activiti-admin-url>
-   </config>
-   -->
-
-   <config evaluator="string-compare" condition="Remote">
-      <remote>
-         <endpoint>
-            <id>alfresco-noauth</id>
-            <name>Alfresco - unauthenticated access</name>
-            <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
-            <connector-id>alfresco</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
-            <identity>none</identity>
-         </endpoint>
-
-         <endpoint>
-            <id>alfresco</id>
-            <name>Alfresco - user access</name>
-            <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-            <connector-id>alfresco</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
-            <identity>user</identity>
-         </endpoint>
-
-         <endpoint>
-            <id>alfresco-feed</id>
-            <name>Alfresco Feed</name>
-            <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
-            <connector-id>http</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
-            <basic-auth>true</basic-auth>
-            <identity>user</identity>
-         </endpoint>
-         
-         <endpoint>
-            <id>activiti-admin</id>
-            <name>Activiti Admin UI - user access</name>
-            <description>Access to Activiti Admin UI, that requires user authentication</description>
-            <connector-id>activiti-admin-connector</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/activiti-admin</endpoint-url>
-            <identity>user</identity>
-         </endpoint>
-      </remote>
-   </config>
-
-   <!-- 
-        Overriding endpoints to reference an Alfresco server with external SSO enabled
-        NOTE: If utilising a load balancer between web-tier and repository cluster, the "sticky
-              sessions" feature of your load balancer must be used.
-        NOTE: If alfresco server location is not localhost:8080 then also combine changes from the
-              "example port config" section below.
-        *Optional* keystore contains SSL client certificate + trusted CAs.
-        Used to authenticate share to an external SSO system such as CAS
-        Remove the keystore section if not required i.e. for NTLM.
-        
-        NOTE: For Kerberos SSO rename the "KerberosDisabled" condition above to "Kerberos"
-        
-        NOTE: For external SSO, switch the endpoint connector to "AlfrescoHeader" and set
-              the userHeader to the name of the HTTP header that the external SSO
-              uses to provide the authenticated user name.
-   -->
-   <!--
-   <config evaluator="string-compare" condition="Remote">
-      <remote>
-         <keystore>
-             <path>alfresco/web-extension/alfresco-system.p12</path>
-             <type>pkcs12</type>
-             <password>alfresco-system</password>
-         </keystore>
-         
-         <connector>
-            <id>alfrescoCookie</id>
-            <name>Alfresco Connector</name>
-            <description>Connects to an Alfresco instance using cookie-based authentication</description>
-            <class>org.alfresco.web.site.servlet.SlingshotAlfrescoConnector</class>
-         </connector>
-         
-         <connector>
-            <id>alfrescoHeader</id>
-            <name>Alfresco Connector</name>
-            <description>Connects to an Alfresco instance using header and cookie-based authentication</description>
-            <class>org.alfresco.web.site.servlet.SlingshotAlfrescoConnector</class>
-            <userHeader>SsoUserHeader</userHeader>
-         </connector>
-
-         <endpoint>
-            <id>alfresco</id>
-            <name>Alfresco - user access</name>
-            <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-            <connector-id>alfrescoCookie</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/wcs</endpoint-url>
-            <identity>user</identity>
-            <external-auth>true</external-auth>
-         </endpoint>
-      </remote>
-   </config>
-   -->
-   
 </alfresco-config>
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/alfresco/web-extension/share-config-custom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/alfresco/web-extension/share-config-custom.xml
deleted file mode 100644
index 3b5c18af..00000000
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/alfresco/web-extension/share-config-custom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<alfresco-config>
-
-      <config evaluator="string-compare" condition="WebFramework">
-           <web-framework>
-               <autowire>
-                   <mode>development</mode>
-               </autowire>
-               <disable-resource-caching>true</disable-resource-caching>
-           </web-framework>
-       </config>
-
-
-    <!-- Global config section -->
-    <config replace="true">
-        <flags>
-            <!--
-               Developer debugging setting to turn on DEBUG mode for client scripts in the browser
-            -->
-            <client-debug>true</client-debug>
-            <!--
-               LOGGING can always be toggled at runtime when in DEBUG mode (Ctrl, Ctrl, Shift, Shift).
-               This flag automatically activates logging on page load.
-            -->
-            <client-debug-autologging>false</client-debug-autologging>
-        </flags>
-    </config>
-
-    <!-- Disable CSRF completely for now -->
-    <!-- It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy -->
-    <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-	<filter/>
-    </config>
-
-    <config evaluator="string-compare" condition="Remote">
-        <remote>
-            <endpoint>
-                <id>alfresco-noauth</id>
-                <name>Alfresco - unauthenticated access</name>
-                <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${alfresco.repo.url}/s</endpoint-url>
-                <identity>none</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco</id>
-                <name>Alfresco - user access</name>
-                <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${alfresco.repo.url}/s</endpoint-url>
-                <identity>user</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco-feed</id>
-                <name>Alfresco Feed</name>
-                <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
-                <connector-id>http</connector-id>
-                <endpoint-url>${alfresco.repo.url}/s</endpoint-url>
-                <basic-auth>true</basic-auth>
-                <identity>user</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>activiti-admin</id>
-                <name>Activiti Admin UI - user access</name>
-                <description>Access to Activiti Admin UI, that requires user authentication</description>
-                <connector-id>activiti-admin-connector</connector-id>
-                <endpoint-url>${alfresco.repo.url}/activiti-admin</endpoint-url>
-                <identity>user</identity>
-            </endpoint>
-        </remote>
-    </config>
-</alfresco-config>
-
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/log4j.properties
deleted file mode 100644
index bf4a4721..00000000
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,266 +0,0 @@
-# This is a full override of Alfresco 4.2.b log4j.properties
-# This file overwrites the alfresco.war log4j.properties
-
-# Set root logger level to error
-log4j.rootLogger=${app.log.root.level}, Console, File
-
-###### Console appender definition #######
-
-# All outputs currently set to be a ConsoleAppender.
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-
-# use log4j NDC to replace %x with tenant domain / username
-log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
-#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-###### File appender definition #######
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=${app.log.dir}alfresco.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-###### Hibernate specific appender definition #######
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-###### Log level overrides #######
-
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
-log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-log4j.logger.org.hibernate.type=warn
-log4j.logger.org.hibernate.cfg.SettingsFactory=warn
-
-# Spring
-log4j.logger.org.springframework=warn
-# Turn off Spring remoting warnings that should really be info or debug.
-log4j.logger.org.springframework.remoting.support=error
-log4j.logger.org.springframework.util=error
-
-# Axis/WSS4J
-log4j.logger.org.apache.axis=info
-log4j.logger.org.apache.ws=info
-
-# CXF
-log4j.logger.org.apache.cxf=error
-
-# MyFaces
-log4j.logger.org.apache.myfaces.util.DebugUtils=info
-log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
-log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
-log4j.logger.org.apache.myfaces.taglib=error
-
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
-# log prepared statement cache activity ###
-log4j.logger.org.hibernate.ps.PreparedStatementCache=info
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.repo.admin=info
-log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
-log4j.logger.org.alfresco.repo.model.filefolder=warn
-log4j.logger.org.alfresco.repo.tenant=info
-log4j.logger.org.alfresco.repo.avm=info
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
-log4j.logger.org.alfresco.repo.management.subsystems=warn
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
-log4j.logger.org.alfresco.repo.security.sync=info
-log4j.logger.org.alfresco.repo.security.person=info
-
-log4j.logger.org.alfresco.sample=info
-log4j.logger.org.alfresco.web=info
-#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-#log4j.logger.org.alfresco.web.bean.clipboard=debug
-log4j.logger.org.alfresco.repo.webservice=info
-log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-#log4j.logger.org.alfresco.web.page=debug
-
-log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
-
-log4j.logger.org.alfresco.web.ui.common.Utils=error
-#log4j.logger.org.alfresco.web.ui.common.Utils=info
-
-log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
-log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
-
-# Specific patches
-log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
-log4j.logger.org.alfresco.repo.version.VersionMigrator=info
-log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info
-
-log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
-log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
-log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
-log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
-log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
-log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
-log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
-log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
-log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
-log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
-log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
-log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info
-log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
-
-#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-
-log4j.logger.org.alfresco.repo.workflow=info
-
-# CIFS server debugging
-log4j.logger.org.alfresco.smb.protocol=error
-#log4j.logger.org.alfresco.smb.protocol.auth=debug
-#log4j.logger.org.alfresco.acegi=debug
-
-# FTP server debugging
-log4j.logger.org.alfresco.ftp.protocol=error
-#log4j.logger.org.alfresco.ftp.server=debug
-
-# WebDAV debugging
-#log4j.logger.org.alfresco.webdav.protocol=debug
-log4j.logger.org.alfresco.webdav.protocol=error
-
-# NTLM servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
-
-# Kerberos servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
-
-# File servers
-log4j.logger.org.alfresco.fileserver=warn
-
-# Repo filesystem debug logging
-#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
-
-# AVM filesystem debug logging
-#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-log4j.logger.org.alfresco.repo.node.integrity=ERROR
-
-# Indexer debugging
-log4j.logger.org.alfresco.repo.search.Indexer=error
-#log4j.logger.org.alfresco.repo.search.Indexer=debug
-
-log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
-#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
-
-# Audit debugging
-# log4j.logger.org.alfresco.repo.audit=DEBUG
-# log4j.logger.org.alfresco.repo.audit.model=DEBUG
-
-# Forms debugging
-# log4j.logger.org.alfresco.web.forms=debug
-# log4j.logger.org.chiba.xml.xforms=debug
-log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error
-log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-log4j.logger.alfresco.missingProperties=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn
-#log4j.logger.org.alfresco.web.ui.repo.component.property=debug
-
-# Dictionary/Model debugging
-log4j.logger.org.alfresco.repo.dictionary=warn
-log4j.logger.org.alfresco.repo.dictionary.types.period=warn
-
-# Virtualization Server Registry
-log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
-
-# Spring context runtime property setter
-log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
-
-# Debugging options for clustering
-log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
-log4j.logger.org.alfresco.repo.content.replication=error
-
-#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
-
-# Activity service
-log4j.logger.org.alfresco.repo.activities=warn
-
-# User usage tracking
-log4j.logger.org.alfresco.repo.usage=info
-
-# Sharepoint
-log4j.logger.org.alfresco.module.vti=info
-
-# Forms Engine
-log4j.logger.org.alfresco.repo.forms=info
-log4j.logger.org.alfresco.web.config.forms=info
-log4j.logger.org.alfresco.web.scripts.forms=info
-
-# CMIS
-log4j.logger.org.alfresco.opencmis=error
-log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
-log4j.logger.org.alfresco.cmis=error
-log4j.logger.org.alfresco.cmis.dictionary=warn
-log4j.logger.org.apache.chemistry.opencmis=info
-
-# IMAP
-log4j.logger.org.alfresco.repo.imap=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
-log4j.logger.org.jbpm.graph.def.GraphElement=fatal
-
-#log4j.logger.org.alfresco.repo.googledocs=debug
-
-###### Scripting #######
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Repository
-log4j.logger.org.alfresco.repo.web.scripts=warn
-log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
-log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
-log4j.logger.org.alfresco.repo.jscript=error
-log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
-log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
-
-log4j.logger.org.alfresco.repo.avm.actions=info
-
-# Freemarker
-# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-# Metadata extraction
-log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
-
-# Reduces PDFont error level due to ALF-7105
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
-
-# no index support
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
-log4j.logger.org.alfresco.demoamp.test=DEBUG
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/tomcat/context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/tomcat/context.xml
deleted file mode 100644
index 68747908..00000000
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/tomcat/context.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is included only when running this project with -Pamp-to-war -->
-<Context docBase="${alfresco.client.war.folder}" path="${alfresco.client.contextPath}">
-
-
-  <Resources className="org.apache.naming.resources.VirtualDirContext"
-    extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
-    
-     
-    <Loader searchVirtualFirst="true" className="org.apache.catalina.loader.VirtualWebappLoader"
-    virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
-  
-  <!-- 
-  <Environment override="false" type="java.lang.Boolean" name="properties/startup.enable" description="A flag that globally enables or disables startup of the major Alfresco subsystems." value="true"/>
-  <Environment override="false" type="java.lang.String" name="properties/dir.root" description="The filesystem directory below which content and index data is stored. Should be on a shared disk if this is a clustered installation."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.dialect" 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"/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.query.substitutions" description="Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to &quot;true TRUE, false FALSE&quot;."/>
-  <Environment override="false" type="java.lang.Boolean" name="properties/hibernate.jdbc.use_get_generated_keys" 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."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.default_schema" 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."/>
-   -->
-   
-  <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources --> 
-  <JarScanner scanAllDirectories="true" />
-  
-</Context>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
index fe03221d..f27a7fc2 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
@@ -28,6 +28,7 @@
             <type>amp</type>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -61,6 +62,7 @@
             </plugin>
         </plugins>
     </build>
+
     <profiles>
     	<!-- Installs the needed runtime component for an Alfresco RM (Records Management) project -->
         <profile>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties
deleted file mode 100644
index 7eace432..00000000
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# SHARE client environment dependent properties (local build)
-share.server.scheme=http
-share.server.name=localhost
-share.server.port=${jetty.port}
-alfresco.server.scheme=http
-alfresco.server.name=localhost
-alfresco.server.port=${jetty.port}
-alfresco.webapp.name=alfresco
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample
index 323b4dcb..f7325bfe 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample
@@ -1,12 +1,18 @@
+<!-- Alfresco 5.0.d custom-slingshot-application-context.xml sample
+
+     Note. Any configuration related to a specific Share extension
+           (such as evaluator bean and message resource bean) should be
+            placed in the specific extension config file, such as for example
+            alfresco-allinone/share-amp/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml
+-->
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- This is a sample configuration file from Alfresco Community 4.2.b - Please adapt to your version -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:hz="http://www.hazelcast.com/schema/config"
+       xmlns:hz="http://www.hazelcast.com/schema/spring"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                http://www.hazelcast.com/schema/config
-                http://www.hazelcast.com/schema/config/hazelcast-spring.xsd">
+                http://www.hazelcast.com/schema/spring
+                http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.xsd">
    
    <!--
         Hazelcast distributed messaging configuration - Share web-tier cluster config (3.4.8 and 4.0.1)
@@ -47,6 +53,7 @@
    <bean id="webframework.factory.requestcontext.servlet" class="org.alfresco.web.site.ClusterAwareRequestContextFactory" parent="webframework.factory.base">
       <property name="linkBuilderFactory" ref="webframework.factory.linkbuilder.servlet" />
       <property name="extensibilityModuleHandler" ref="webscripts.extensibility.handler" />
+      <property name="dependencyHandler" ref="dependency.handler" />
       <property name="clusterObjectPersister" ref="webframework.slingshot.persister.remote" />
    </bean>
    -->
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample
index a6c906ad..6281cfcd 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample
@@ -1,4 +1,11 @@
-<!-- This is a sample configuration file from Alfresco Community 4.2.b - Please adapt to your version -->
+<!-- Alfresco 5.0.d share-config-custom.xml sample.
+
+     Note:
+     Any configuration related to a specific Share AMP extension
+     (such as doclib action config and form config)
+     should be added to that extension's custom config
+     (i.e. into the share-amp/src/main/resources/META-INF/share-config-custom.xml)
+     -->
 <alfresco-config>
 
    <!-- Global config section -->
@@ -37,6 +44,62 @@
       </web-framework>
    </config>
 
+   <!-- Disable the CSRF Token Filter -->
+   <!--
+   <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
+      <filter/>
+   </config>
+   -->
+
+   <!--
+      To run the CSRF Token Filter behind 1 or more proxies that do not rewrite the Origin or Referere headers:
+
+      1. Copy the "CSRFPolicy" default config in share-security-config.xml and paste it into this file.
+      2. Replace the old config by setting the <config> element's "replace" attribute to "true" like below:
+         <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
+      3. To every <action name="assertReferer"> element add the following child element
+         <param name="referer">http://www.proxy1.com/.*|http://www.proxy2.com/.*</param>
+      4. To every <action name="assertOrigin"> element add the following child element
+         <param name="origin">http://www.proxy1.com|http://www.proxy2.com</param>
+   -->
+
+   <!--
+      Remove the default wildcard setting and use instead a strict whitelist of the only domains that shall be allowed
+      to be used inside iframes (i.e. in the WebView dashlet on the dashboards)
+   -->
+   <!--
+   <config evaluator="string-compare" condition="IFramePolicy" replace="true">
+      <cross-domain>
+         <url>http://www.trusted-domain-1.com/</url>
+         <url>http://www.trusted-domain-2.com/</url>
+      </cross-domain>
+   </config>
+   -->
+
+   <!-- Turn off header that stops Share from being displayed in iframes on pages from other domains -->
+   <!--
+   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
+      <headers>
+         <header>
+            <name>X-Frame-Options</name>
+            <enabled>false</enabled>
+         </header>
+      </headers>
+   </config>
+   -->
+
+   <!-- Prevent browser communication over HTTP (for HTTPS servers) -->
+   <!--
+   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
+      <headers>
+         <header>
+            <name>Strict-Transport-Security</name>
+            <value>max-age=31536000</value>
+         </header>
+      </headers>
+   </config>
+   -->
+
    <config evaluator="string-compare" condition="Replication">
       <share-urls>
          <!--
@@ -63,7 +126,12 @@
          <!--
             Optionally limit the number of folders shown in treeview throughout Share.
          -->
-         <maximum-folder-count>-1</maximum-folder-count>
+         <maximum-folder-count>1000</maximum-folder-count>
+         
+         <!--  
+            Default timeout in milliseconds for folder Tree component to recieve response from Repository
+         -->
+         <timeout>7000</timeout>
       </tree>
 
       <!--
@@ -86,9 +154,11 @@
             <aspect name="emailserver:aliasable" />
             <aspect name="cm:taggable" />
             <aspect name="app:inlineeditable" />
-            <aspect name="gd:googleEditable" />
             <aspect name="cm:geographic" />
             <aspect name="exif:exif" />
+            <aspect name="audio:audio" />
+            <aspect name="cm:indexControl" />
+            <aspect name="dp:restrictable" />
          </visible>
 
          <!-- Aspects that a user can add. Same as "visible" if left empty -->
@@ -117,6 +187,10 @@
 
          <type name="cm:folder">
          </type>
+
+         <type name="trx:transferTarget">
+            <subtype name="trx:fileTransferTarget" />
+         </type>
       </types>
 
       <!--
@@ -139,8 +213,8 @@
             The I18N label is created from the "type" attribute, e.g. google-docs.doc=Google Docs&trade; Document
          -->
          <creatable-types>
-            <creatable type="doc">application/msword</creatable>
-            <creatable type="xls">application/vnd.ms-excel</creatable>
+            <creatable type="doc">application/vnd.openxmlformats-officedocument.wordprocessingml.document</creatable>
+            <creatable type="xls">application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</creatable>
             <creatable type="ppt">application/vnd.ms-powerpoint</creatable>
          </creatable-types>
       </google-docs>
@@ -209,14 +283,19 @@
             This is a relatively expensive operation, so should be set to "false" for Repositories with broad folder structures.
          -->
          <evaluate-child-folders>false</evaluate-child-folders>
-         
+
          <!--
             Optionally limit the number of folders shown in treeview throughout Share.
          -->
          <maximum-folder-count>500</maximum-folder-count>
       </tree>
+
+      <!--
+         Whether the link to the Repository Library appears in the header component or not.
+      -->
+      <visible>true</visible>
    </config>
-   
+
    <!-- Kerberos settings -->
    <!-- To enable kerberos rename this condition to "Kerberos" -->
    <config evaluator="string-compare" condition="KerberosDisabled" replace="true">
@@ -243,11 +322,21 @@
             JAAS login configuration entry name.
          -->
          <config-entry>ShareHTTP</config-entry>
+        <!--
+           A Boolean which when true strips the @domain sufix from Kerberos authenticated usernames.
+           Use together with stripUsernameSuffix property in alfresco-global.properties file.
+        -->
+        <stripUserNameSuffix>true</stripUserNameSuffix>
       </kerberos>
    </config>
 
-	<!-- example port config used to access remote Alfresco server (default is 8080) -->
+   <!-- Uncomment and modify the URL to Activiti Admin Console if required. -->
    <!--
+   <config evaluator="string-compare" condition="ActivitiAdmin" replace="true">
+      <activiti-admin-url>http://localhost:8080/alfresco/activiti-admin</activiti-admin-url>
+   </config>
+   -->
+
    <config evaluator="string-compare" condition="Remote">
       <remote>
          <endpoint>
@@ -277,20 +366,21 @@
             <basic-auth>true</basic-auth>
             <identity>user</identity>
          </endpoint>
-         
+
          <endpoint>
-            <id>activiti-admin</id>
-            <name>Activiti Admin UI - user access</name>
-            <description>Access to Activiti Admin UI, that requires user authentication</description>
-            <connector-id>activiti-admin-connector</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/activiti-admin</endpoint-url>
+            <id>alfresco-api</id>
+            <parent-id>alfresco</parent-id>
+            <name>Alfresco Public API - user access</name>
+            <description>Access to Alfresco Repository Public API that require user authentication.
+                         This makes use of the authentication that is provided by parent 'alfresco' endpoint.</description>
+            <connector-id>alfresco</connector-id>
+            <endpoint-url>http://localhost:8080/alfresco/api</endpoint-url>
             <identity>user</identity>
          </endpoint>
       </remote>
    </config>
-	-->
 
-   <!-- 
+   <!--
         Overriding endpoints to reference an Alfresco server with external SSO enabled
         NOTE: If utilising a load balancer between web-tier and repository cluster, the "sticky
               sessions" feature of your load balancer must be used.
@@ -299,12 +389,23 @@
         *Optional* keystore contains SSL client certificate + trusted CAs.
         Used to authenticate share to an external SSO system such as CAS
         Remove the keystore section if not required i.e. for NTLM.
-        
+
         NOTE: For Kerberos SSO rename the "KerberosDisabled" condition above to "Kerberos"
-        
-        NOTE: For external SSO, switch the endpoint connector to "AlfrescoHeader" and set
-              the userHeader to the name of the HTTP header that the external SSO
+
+        NOTE: For external SSO, switch the endpoint connector to "alfrescoHeader" and set
+              the userHeader value to the name of the HTTP header that the external SSO
               uses to provide the authenticated user name.
+        NOTE: For external SSO, Share now supports the "userIdPattern" mechanism as is available
+              on the repository config for External Authentication sub-system. Add the following
+              element to your "alfrescoHeader" connector config:
+              <userIdPattern>^ignore-(\w+)-ignore</userIdPattern>
+              This is an example, ensure the Id pattern matches your repository config.
+        NOTE: For external SSO, Share now supports stateless (no Http Session or sticky session)
+              connection to the repository when using the alfrescoHeader remote user connector.
+              e.g. You can change endpoint config to use the faster /service URL instead of the
+              /wcs URL if you are using External Authentication and then remove sticky session config
+              from your proxy between Share and Alfresco. Note that this is also faster because Share
+              will no longer call the /touch REST API before every remote call to the repository.
    -->
    <!--
    <config evaluator="string-compare" condition="Remote">
@@ -314,14 +415,14 @@
              <type>pkcs12</type>
              <password>alfresco-system</password>
          </keystore>
-         
+
          <connector>
             <id>alfrescoCookie</id>
             <name>Alfresco Connector</name>
             <description>Connects to an Alfresco instance using cookie-based authentication</description>
             <class>org.alfresco.web.site.servlet.SlingshotAlfrescoConnector</class>
          </connector>
-         
+
          <connector>
             <id>alfrescoHeader</id>
             <name>Alfresco Connector</name>
@@ -339,8 +440,50 @@
             <identity>user</identity>
             <external-auth>true</external-auth>
          </endpoint>
+
+         <endpoint>
+            <id>alfresco-feed</id>
+            <parent-id>alfresco</parent-id>
+            <name>Alfresco Feed</name>
+            <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
+            <connector-id>alfrescoHeader</connector-id>
+            <endpoint-url>http://localhost:8080/alfresco/wcs</endpoint-url>
+            <identity>user</identity>
+            <external-auth>true</external-auth>
+         </endpoint>
+
+         <endpoint>
+            <id>alfresco-api</id>
+            <parent-id>alfresco</parent-id>
+            <name>Alfresco Public API - user access</name>
+            <description>Access to Alfresco Repository Public API that require user authentication.
+                         This makes use of the authentication that is provided by parent 'alfresco' endpoint.</description>
+            <connector-id>alfrescoHeader</connector-id>
+            <endpoint-url>http://localhost:8080/alfresco/api</endpoint-url>
+            <identity>user</identity>
+            <external-auth>true</external-auth>
+         </endpoint>
       </remote>
    </config>
    -->
-   
+
+   <!-- Cookie settings -->
+   <!-- To disable alfUsername2 cookie set enableCookie value to "false" -->
+   <!--
+   <plug-ins>
+      <element-readers>
+         <element-reader element-name="cookie" class="org.alfresco.web.config.cookie.CookieElementReader"/>
+      </element-readers>
+   </plug-ins>
+
+   <config evaluator="string-compare" condition="Cookie" replace="true">
+      <cookie>
+         <enableCookie>false</enableCookie>
+         <cookies-to-remove>
+            <cookie-to-remove>alfUsername3</cookie-to-remove>
+            <cookie-to-remove>alfLogin</cookie-to-remove>
+         </cookies-to-remove>
+      </cookie>
+   </config>
+   -->
 </alfresco-config>
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties
index 12d10f02..49d83d0a 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties
@@ -1,5 +1,5 @@
 # Set root logger level to error
-log4j.rootLogger=${app.log.root.level}, Console, File
+log4j.rootLogger=error, Console, File
 
 ###### Console appender definition #######
 
@@ -17,27 +17,7 @@ log4j.appender.File.File=${app.log.dir}share.log
 log4j.appender.File.Append=true
 log4j.appender.File.DatePattern='.'yyyy-MM-dd
 log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-###### Hibernate specific appender definition #######
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-###### Log level overrides #######
-
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
-log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-log4j.logger.org.hibernate.type=warn
-log4j.logger.org.hibernate.cfg.SettingsFactory=warn
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
 
 # Spring
 log4j.logger.org.springframework=warn
@@ -45,218 +25,23 @@ log4j.logger.org.springframework=warn
 log4j.logger.org.springframework.remoting.support=error
 log4j.logger.org.springframework.util=error
 
-# Axis/WSS4J
-log4j.logger.org.apache.axis=info
-log4j.logger.org.apache.ws=info
-
-# CXF
-log4j.logger.org.apache.cxf=error
-
 # MyFaces
 log4j.logger.org.apache.myfaces.util.DebugUtils=info
 log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
 log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
 log4j.logger.org.apache.myfaces.taglib=error
 
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
-# log prepared statement cache activity ###
-log4j.logger.org.hibernate.ps.PreparedStatementCache=info
-
 # Alfresco
 log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.repo.admin=info
-log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
-log4j.logger.org.alfresco.repo.model.filefolder=warn
-log4j.logger.org.alfresco.repo.tenant=info
-log4j.logger.org.alfresco.repo.avm=info
 log4j.logger.org.alfresco.config=warn
 log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
-log4j.logger.org.alfresco.repo.management.subsystems=warn
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
-log4j.logger.org.alfresco.repo.security.sync=info
-log4j.logger.org.alfresco.repo.security.person=info
-
-log4j.logger.org.alfresco.sample=info
 log4j.logger.org.alfresco.web=info
-#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-#log4j.logger.org.alfresco.web.bean.clipboard=debug
-log4j.logger.org.alfresco.repo.webservice=info
-log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-#log4j.logger.org.alfresco.web.page=debug
-
-log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
-
-log4j.logger.org.alfresco.web.ui.common.Utils=error
-#log4j.logger.org.alfresco.web.ui.common.Utils=info
-
-log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
-log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
-
-# Specific patches
-log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
-log4j.logger.org.alfresco.repo.version.VersionMigrator=info
-log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info
-
-log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
-log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
-log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
-log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
-log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
-log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
-log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
-log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
-log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
-log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
-log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
-log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info
-log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
-
-#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-
-log4j.logger.org.alfresco.repo.workflow=info
-
-# CIFS server debugging
-log4j.logger.org.alfresco.smb.protocol=error
-#log4j.logger.org.alfresco.smb.protocol.auth=debug
-#log4j.logger.org.alfresco.acegi=debug
-
-# FTP server debugging
-log4j.logger.org.alfresco.ftp.protocol=error
-#log4j.logger.org.alfresco.ftp.server=debug
-
-# WebDAV debugging
-#log4j.logger.org.alfresco.webdav.protocol=debug
-log4j.logger.org.alfresco.webdav.protocol=error
-
-# NTLM servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
-
-# Kerberos servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
-
-# File servers
-log4j.logger.org.alfresco.fileserver=warn
-
-# Repo filesystem debug logging
-#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
-
-# AVM filesystem debug logging
-#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-log4j.logger.org.alfresco.repo.node.integrity=ERROR
-
-# Indexer debugging
-log4j.logger.org.alfresco.repo.search.Indexer=error
-#log4j.logger.org.alfresco.repo.search.Indexer=debug
-
-log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
-#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
-
-# Audit debugging
-# log4j.logger.org.alfresco.repo.audit=DEBUG
-# log4j.logger.org.alfresco.repo.audit.model=DEBUG
-
-# Forms debugging
-# log4j.logger.org.alfresco.web.forms=debug
-# log4j.logger.org.chiba.xml.xforms=debug
-log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error
-log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-log4j.logger.alfresco.missingProperties=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn
-#log4j.logger.org.alfresco.web.ui.repo.component.property=debug
-
-# Dictionary/Model debugging
-log4j.logger.org.alfresco.repo.dictionary=warn
-log4j.logger.org.alfresco.repo.dictionary.types.period=warn
-
-# Virtualization Server Registry
-log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
-
-# Spring context runtime property setter
-log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
-
-# Debugging options for clustering
-log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
-log4j.logger.org.alfresco.repo.content.replication=error
-
-#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
-
-# Activity service
-log4j.logger.org.alfresco.repo.activities=warn
-
-# User usage tracking
-log4j.logger.org.alfresco.repo.usage=info
-
-# Sharepoint
-log4j.logger.org.alfresco.module.vti=info
-
-# Forms Engine
-log4j.logger.org.alfresco.repo.forms=info
-log4j.logger.org.alfresco.web.config.forms=info
-log4j.logger.org.alfresco.web.scripts.forms=info
-
-# CMIS
-log4j.logger.org.alfresco.opencmis=error
-log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
-log4j.logger.org.alfresco.cmis=error
-log4j.logger.org.alfresco.cmis.dictionary=warn
-log4j.logger.org.apache.chemistry.opencmis=info
-
-# IMAP
-log4j.logger.org.alfresco.repo.imap=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
-log4j.logger.org.jbpm.graph.def.GraphElement=fatal
-
-#log4j.logger.org.alfresco.repo.googledocs=debug
-
-###### Scripting #######
 
 # Web Framework
 log4j.logger.org.springframework.extensions.webscripts=info
 log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
 log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
 
-# Repository
-log4j.logger.org.alfresco.repo.web.scripts=warn
-log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
-log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
-log4j.logger.org.alfresco.repo.jscript=error
-log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
-log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
-
-log4j.logger.org.alfresco.repo.avm.actions=info
-
 # Freemarker
 # Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-# Metadata extraction
-log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
-
-# Reduces PDFont error level due to ALF-7105
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
-
-# no index support
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
\ No newline at end of file
+log4j.logger.freemarker.runtime=
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml
index e5232404..01b78708 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml
@@ -1,12 +1,21 @@
 <alfresco-config>
 
-      <config evaluator="string-compare" condition="WebFramework">
-           <web-framework>
-               <autowire>
-                   <mode>development</mode>
-               </autowire>
-           </web-framework>
-       </config>
+    <config evaluator="string-compare" condition="WebFramework">
+        <web-framework>
+            <autowire>
+                <!-- Changing this to 'development' currently breaks the Admin Console so it does not work correctly.
+                     During testing we instead disable JS compilation by overriding bean javaScriptProcessor -->
+                <mode>production</mode>
+            </autowire>
+
+            <!--
+                 If resource caching has been disabled then all the dependency caches will be cleared
+                 before processing the Aikau jsonModel request...
+                    (i.e. this.dojoDependencyHandler.clearCaches() )
+            -->
+            <disable-resource-caching>true</disable-resource-caching>
+        </web-framework>
+    </config>
 
 
     <!-- Global config section -->
@@ -24,12 +33,18 @@
         </flags>
     </config>
 
-    <!-- Disable CSRF completely for now -->
-    <!-- It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy -->
+    <!--
+        Disable CSRF completely for now
+        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
+        -->
     <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-	<filter/>
+        <filter/>
     </config>
 
+    <!--
+        Change so it is picked up from property where the Alfresco Repo Webapp is running
+        (e.g. http://localhost:8080/alfresco)
+        -->
     <config evaluator="string-compare" condition="Remote">
         <remote>
             <endpoint>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/log4j.properties
new file mode 100644
index 00000000..3afc32dc
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/log4j.properties
@@ -0,0 +1,52 @@
+# This file is copied from Alfresco Share 5.0.d
+# Overrides tomcat/webapps/share/WEB-INF/classes/log4j,properties
+# and sets new file location from property and log level from property.
+#
+
+# Set root logger level to error
+log4j.rootLogger=${app.log.root.level}, Console, File
+
+###### Console appender definition #######
+
+# All outputs currently set to be a ConsoleAppender.
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+
+# use log4j NDC to replace %x with tenant domain / username
+log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
+#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
+
+###### File appender definition #######
+log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.File.File=${app.log.dir}alfresco.log
+log4j.appender.File.Append=true
+log4j.appender.File.DatePattern='.'yyyy-MM-dd
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
+
+# Spring
+log4j.logger.org.springframework=warn
+# Turn off Spring remoting warnings that should really be info or debug.
+log4j.logger.org.springframework.remoting.support=error
+log4j.logger.org.springframework.util=error
+
+# MyFaces
+log4j.logger.org.apache.myfaces.util.DebugUtils=info
+log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
+log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
+log4j.logger.org.apache.myfaces.taglib=error
+
+# Alfresco
+log4j.logger.org.alfresco=error
+log4j.logger.org.alfresco.config=warn
+log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
+log4j.logger.org.alfresco.web=info
+
+# Web Framework
+log4j.logger.org.springframework.extensions.webscripts=info
+log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
+log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+log4j.logger.freemarker.runtime=
\ No newline at end of file
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index 9d367dd2..ecd1f9b1 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+         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>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
@@ -16,46 +16,34 @@
     </parent>
 
     <!-- 
-       | SDK properties have sensible defaults in the SDK parent,
-       | but you can override the properties below to use another version. 
-       | For more available properties see the alfresco-sdk-parent POM. 
+        SDK properties have sensible defaults in the SDK parent,
+        but you can override the properties below to use another version.
+        For more available properties see the alfresco-sdk-parent POM.
        -->
     <properties>
-        <!--
-            | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco
-            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details
+        <!-- If you want to change the default data location and Alfresco version, uncomment the following 2 properties:
+               <alfresco.version>specify version number here</alfresco.version>
+               <alfresco.data.location>specify folder name here</alfresco.data.location> -->
+
+        <!-- This control the root logging level for all apps uncomment and change, defaults to WARN
+            <app.log.root.level>WARN</app.log.root.level>
+        -->
+
+        <!-- Set the enviroment to use, this controls which properties will be picked in src/test/properties
+             for embedded run, defaults to the 'local' environment.
+        <env>other environment name</env>
         -->
-        <!-- <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId> -->
-        <!-- Defines the Alfresco version to work against.
-             Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0)  -->
-        <!-- <alfresco.version>${alfresco_target_version}</alfresco.version>-->
-        <app.log.root.level>WARN</app.log.root.level>
-        <alfresco.data.location>alf_data_dev</alfresco.data.location>
-        <!-- This controls which properties will be picked in src/test/properties for embedded run -->
-        <env>local</env>
-        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war profile
-             | Defaults to a vanilla repository AMP, but could point to your foundation / aggregator WAR 
-        .    | Allowed values for Community: alfresco | share
-             | Allowed values for Enterprise: alfresco-enterprise | share-enterprise
-             <alfresco.client.war>${alfresco.repo.artifactId}</alfresco.client.war> -->
-        <!-- Context path to run alfresco on -->
-        <alfresco.client.contextPath>/alfresco</alfresco.client.contextPath>
-        <!-- Defines the target WAR groupId to run this amp, only used with the -Pamp-to-war switch
-        .    | Could be org.alfresco or your corporate groupId -->
-        <!-- <alfresco.client.war.groupId>${alfresco.groupId}</alfresco.client.war.groupId> -->
-        
-        <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war switch -->
-        <!-- <alfresco.client.war.version>${alfresco.version}</alfresco.client.war.version>-->
     </properties>
 
     <!-- Here we realize the connection with the Alfresco selected platform 
         (e.g.version and edition) -->
     <dependencyManagement>
         <dependencies>
-            <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco version/edition
-                (see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies) 
-                NOTE: You still need to define dependencies in your POM, but you can omit version as it's enforced by this dependencyManagement. NOTE: It defaults 
-                to the latest version this SDK pom has been tested with, but alfresco version can/should be overridden in your project's pom -->
+            <!-- Setup what versions of the different Alfresco artifacts that will be used (depends on alfresco.version),
+                 so we don't have to specify version in any of the dependency definitions in our POM.
+                 For more info see:
+                    http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies
+            -->
             <dependency>
                 <groupId>${alfresco.groupId}</groupId>
                 <artifactId>alfresco-platform-distribution</artifactId>
@@ -65,17 +53,22 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <!-- Following dependencies are needed for compiling Java code in src/main/java; 
-         <scope>provided</scope> is inherited for each of the following; 
-         for more info, please refer to alfresco-platform-distribution POM -->
+
     <dependencies>
+        <!-- Following dependencies are needed for compiling Java code in src/main/java;
+             <scope>provided</scope> is inherited for each of the following;
+             for more info, please refer to alfresco-platform-distribution POM -->
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-repository</artifactId>
         </dependency>
     </dependencies>
+
     <profiles>
-    	<!-- Enterprise profile, manually activated, automatically adds support for Enterprise edition development (dependencies) -->
+        <!--
+            Brings in the extra Enterprise specific repository classes,
+            if the 'enterprise' profile has been activated, needs to be activated manually.
+            -->
         <profile>
             <id>enterprise</id>
             <dependencies>
@@ -87,5 +80,23 @@
                 </dependency>
             </dependencies>
         </profile>
+
+        <!--
+            If the 'amp-to-war' profile is enabled then make sure to bring in the alfresco-rad module,
+            which has the H2 scripts and other RAD features.
+
+            TODO: TO INVESTIGATE: This dependency is already defined in the parent SDK pom in the 'amp-to-war' profile
+                  but this does not work, it is not include...
+            -->
+        <profile>
+            <id>amp-to-war</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.alfresco.maven</groupId>
+                    <artifactId>alfresco-rad</artifactId>
+                    <version>${maven.alfresco.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties
new file mode 100644
index 00000000..90cda7d7
--- /dev/null
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties
@@ -0,0 +1,5 @@
+## This Alfresco Repo Configuration file should be used for custom properties that are introduced by this module.
+## Define default values for all properties here.
+## System Administrators can override these values in environment specific configurations in
+## alfresco/tomcat/shared/classes/alfresco-global.properties.
+## 
\ No newline at end of file
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
new file mode 100644
index 00000000..e5421cc0
--- /dev/null
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <!-- The bootstrap-context.xml file is used for patch definitions, importers, 
+		 workflow, and loading custom content models.  -->
+
+
+    <!-- Registration of new models -->
+    <bean id="com.mycompany.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+        <property name="models">
+            <list>
+                <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>
+                <value>alfresco/module/${project.artifactId}/model/workflow-model.xml</value>
+
+            </list>
+        </property>
+    </bean>
+	
+
+
+</beans>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml
new file mode 100644
index 00000000..91f54ae6
--- /dev/null
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="myc:contentModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+    <!-- Optional meta-data about the model -->
+    <description>Document Model for Repo Extension X</description>
+    <author>My Name</author>
+    <version>1.0</version>
+
+    <imports>
+        <!-- Import Alfresco Dictionary Definitions -->
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <!-- Import Alfresco Content Domain Model Definitions -->
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+        <!-- Import Alfresco System Model Definitions -->
+        <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
+    </imports>
+
+    <!-- Custom namespace for your domain -->
+    <namespaces>
+        <namespace uri="http://www.mycompany.com/model/content/1.0" prefix="myc"/>
+    </namespaces>
+
+    <!-- ===============================================================================================================
+        Constraints, Types, and Aspects go here...
+        -->
+
+</model>
\ No newline at end of file
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml
new file mode 100644
index 00000000..580e3f20
--- /dev/null
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="myw:workflowModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+    <!-- Optional meta-data about the model -->
+    <description>Workflow Model for Repo Extension X</description>
+    <author>My Name</author>
+    <version>1.0</version>
+
+    <imports>
+        <!-- Import Alfresco Dictionary Definitions -->
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <!-- Import Alfresco Content Domain Model Definitions -->
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+        <!-- Import Alfresco Workflow Model Definitions -->
+        <import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/>
+    </imports>
+
+    <!-- Custom namespace for your domain -->
+    <namespaces>
+        <namespace uri="http://www.mycompany.com/model/workflow/1.0" prefix="myw"/>
+    </namespaces>
+
+    <!-- ===============================================================================================================
+        Constraints, Types, and Aspects go here...
+        -->
+</model>
+
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml
index 223aed4f..307dcfd1 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml
@@ -14,11 +14,12 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 	
--->
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-	<!-- This is filtered by Maven at build time, so that module name is single sourced. -->
-    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
-    
-</beans>
+-->
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+	<!-- This is filtered by Maven at build time, so that module name is single sourced. -->
+    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
+    <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
+    
+</beans>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
index 2d7b7a11..eed88e1b 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
@@ -12,36 +12,48 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-
-
 # RUN TIME PROPERTIES
 # -------------------
 
-# Sample custom content and index data location
-# This will create alf_data Relative to appserver run folder
-# In this default file we take the property from the POM (for compatibility with local tomcat and jboss deployments) but it can also be edited here.
+########################################################################################################################
+# Alfresco configuration for running locally
+#
+# Configuration when running Tomcat embedded from Maven.
+# This will create the alf_data_dev directory relative to Tomcat run folder.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
+
 dir.root=${alfresco.data.location}
-# Allowed values are: NONE, AUTO, FULL
+
+# Alfresco Repo Webapp (alfresco.war) context, ports etc
+alfresco.context=alfresco
+alfresco.host=localhost
+alfresco.port=8080
+alfresco.protocol=http
+
+# Alfresco Share Webapp (share.war) context, ports etc
+share.context=share
+share.host=localhost
+share.port=8080
+share.protocol=http
+
+# Don't try and recover any index
 index.recovery.mode=NONE
 # As we run embedded, we set Lucene
 # TODO: Find a better solution for indexing, as buildonly (embedded Lucene) is deprecated and going to be removed soon
-#index.subsystem.name=noindex
-#index.subsystem.name=solr
-#index.subsystem.name=solr4
 index.subsystem.name=buildonly
 
-
-#dir.keystore=.
-#keystore.password=storepassword
-#metadata.password=metapassword
+# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date
+# See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597
+# If you want to enable them (and so full WQS functionality), please also set index.subsystem.name=lucene
+wcmqs.dynamicCollectionProcessor.schedule=0 30 2 * * ? 2060
+wcmqs.feedbackProcessor.schedule=0 40 2 * * ? 2060
+wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060
 
 # Fail or not when there are node integrity checker errors
 integrity.failOnError=true
 
 # Database connection properties
-# These are also filtered from Maven at build time from POM properties. 
-# Alternatively you can directly define them directly here
 db.driver=${alfresco.db.datasource.class}
 db.url=${alfresco.db.url}
 db.username=${alfresco.db.username}
@@ -51,9 +63,6 @@ db.pool.max=100
 hibernate.dialect=org.hibernate.dialect.H2Dialect
 
 # File servers related properties
-# For local builds we disable CIFS and FTP. Edit the following property to reenable them
+# For local runs we disable CIFS and FTP
 cifs.enabled=false
-
-ftp.enabled=false
-ftp.port=1121
-ftp.authenticator=alfresco
+ftp.enabled=false
\ No newline at end of file
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
index 8d9fb35a..07829ea1 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
@@ -17,7 +17,17 @@
     limitations under the License.
 -->
 <beans>
-    <!-- This disables javascript compilation so that webscripts can be hot reloaded -->
+    <!--
+        To support hot reloading of server side Javascript files in Share, we have to turn on development mode.
+        This setting will tell the Rhinoscript Processor not to compile and cache the JS files.
+        Cool, we can now change server side JS files and have the changes picked up,
+        without having to restart or refresh web scripts.
+
+        But… Due to a known bug in the Surf framework (ALF-9970) this will break the admin consoles in Share.
+
+        Override this bean and disable javascript compilation so that webscripts can be hot reloaded.
+        We have changed the 'compile' property from true to false.
+        -->
     <bean id="javaScriptProcessor" class="org.alfresco.repo.jscript.RhinoScriptProcessor" init-method="register">
         <property name="name">
             <value>javascript</value>
@@ -25,7 +35,7 @@
         <property name="extension">
             <value>js</value>
         </property>
-        <!-- compile javascript and cache compiled scripts -->
+        <!-- Do not "compile javascript and cache compiled scripts" -->
         <property name="compile">
             <value>false</value>
         </property>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
index b7abe44b..0862d9c0 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context docBase="${alfresco.client.war.folder}" path="${alfresco.client.contextPath}">
+<!-- ===================================================================================================================
+    This context file is used only in a development IDE for rapid development,
+    it is never released with the Alfresco.war
+    =================================================================================================================-->
 
+<!-- Setup docBase to something like repo-amp/target/repo-amp-war
+     and path to /alfresco
+     The Alfresco.war 5.0 does not have a webapp (it used to have Alfresco Explorer but not anymore)
+     that we will access, so this docBase might not be needed
+-->
+<Context docBase="${app.amp.client.war.folder}" path="${alfresco.client.contextPath}">
 
   <Resources className="org.apache.naming.resources.VirtualDirContext"
-    extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
+             extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
     
-     
-    <Loader searchVirtualFirst="true" className="org.apache.catalina.loader.VirtualWebappLoader"
-    virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
-  
-  <!-- 
-  <Environment override="false" type="java.lang.Boolean" name="properties/startup.enable" description="A flag that globally enables or disables startup of the major Alfresco subsystems." value="true"/>
-  <Environment override="false" type="java.lang.String" name="properties/dir.root" description="The filesystem directory below which content and index data is stored. Should be on a shared disk if this is a clustered installation."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.dialect" 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"/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.query.substitutions" description="Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to &quot;true TRUE, false FALSE&quot;."/>
-  <Environment override="false" type="java.lang.Boolean" name="properties/hibernate.jdbc.use_get_generated_keys" 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."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.default_schema" 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."/>
-   -->
-   
-  
+    <Loader searchVirtualFirst="true"
+            className="org.apache.catalina.loader.VirtualWebappLoader"
+            virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
+
+    <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources -->
+    <JarScanner scanAllDirectories="true" />
 </Context>
diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml
index 09361354..76d73520 100644
--- a/archetypes/share-amp-archetype/pom.xml
+++ b/archetypes/share-amp-archetype/pom.xml
@@ -1,54 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.alfresco.maven.archetype</groupId>
-  <artifactId>share-amp-archetype</artifactId>
+    <groupId>org.alfresco.maven.archetype</groupId>
+    <artifactId>share-amp-archetype</artifactId>
 
-  <packaging>maven-archetype</packaging>
-  <name>Maven Alfresco SDK - Share AMP Archetype</name>
-  <description>Share project with full support for lifecycle and rapid development of AMPs (Alfresco Module Packages)</description>
+    <packaging>maven-archetype</packaging>
+    <name>Maven Alfresco SDK - Share AMP Archetype</name>
+    <description>Share project with full support for lifecycle and rapid development of AMPs (Alfresco Module
+        Packages)
+    </description>
 
-  <parent>
-    <groupId>org.alfresco.maven</groupId>
-    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
+    <parent>
+        <groupId>org.alfresco.maven</groupId>
+        <artifactId>alfresco-sdk-aggregator</artifactId>
+        <version>2.0.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
 
-  <build>
-      <resources>
-        <resource>
-            <directory>src/main/resources</directory>
-            <includes>
-                <include>archetype-resources/pom.xml</include>
-                <include>archetype-resources/run.sh</include>
-                <include>META-INF/maven/archetype-metadata.xml</include>
-            </includes>
-            <filtering>true</filtering>
-        </resource>
-        <resource>
-            <directory>src/main/resources</directory>
-            <excludes>
-                <exclude>archetype-resources/pom.xml</exclude>
-                <exclude>archetype-resources/run.sh</exclude>
-                <exclude>META-INF/maven/archetype-metadata.xml</exclude>
-            </excludes>
-            <filtering>false</filtering>
-        </resource>
-      </resources>
-      <plugins>
-        <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>2.7</version>
-            <configuration>
-                <useDefaultDelimiters>false</useDefaultDelimiters>
-                <delimiters>
-                    <delimiter>@@</delimiter>
-                </delimiters>
-            </configuration>
-        </plugin>
-      </plugins>
-  </build>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>archetype-resources/pom.xml</include>
+                    <include>archetype-resources/run.sh</include>
+                    <include>META-INF/maven/archetype-metadata.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>archetype-resources/pom.xml</exclude>
+                    <exclude>archetype-resources/run.sh</exclude>
+                    <exclude>META-INF/maven/archetype-metadata.xml</exclude>
+                </excludes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                    <delimiters>
+                        <delimiter>@@</delimiter>
+                    </delimiters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
index c24f8ff4..ff660e85 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+         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>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
@@ -16,30 +16,34 @@
     </parent>
 
     <!-- 
-       | SDK properties have sensible defaults in the SDK parent,
-       | but you can override the properties below to use another version. 
-       | For more available properties see the alfresco-sdk-parent POM. 
+        SDK properties have sensible defaults in the SDK parent,
+        but you can override the properties below to use another version.
+        For more available properties see the alfresco-sdk-parent POM.
        -->
     <properties>
-        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
-        | Allowed values: alfresco | share. In this case it's configured to use OOTB share -->
-        <alfresco.client.war>${alfresco.share.artifactId}</alfresco.client.war>
-        <alfresco.client.contextPath>/share</alfresco.client.contextPath>
+        <!-- If you want to change the default Alfresco version, uncomment the following property:
+               <alfresco.version>specify version number here</alfresco.version>
+               -->
+
+        <!-- This control the root logging level for all apps uncomment and change, defaults to WARN
+            <app.log.root.level>WARN</app.log.root.level>
+        -->
+
+        <!-- Set the enviroment to use, this controls which properties will be picked in src/test/properties
+             for embedded run, defaults to the 'local' environment.
+        <env>other environment name</env>
+        -->
+
+        <!-- The Maven artifact ID to use when loading the Share.WAR that the AMP should be applied to,
+                    defaults to the alfresco.war artifact ID, so we need to override here. -->
+        <app.amp.client.war.artifactId>${alfresco.share.artifactId}</app.amp.client.war.artifactId>
+
         <!-- Since Alfresco is already running on port 8080, we run Share on port 8081 -->
         <maven.tomcat.port>8081</maven.tomcat.port>
 
         <!-- Used in share-config-custom.xml. By default points to standard location of Alfresco -->
         <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
-        
-        <!-- Defines the Alfresco version to work against.
-             Community versions are typically identified by major.minor.character (4.2.a), 
-             while Enterprise versions are identified by major.minor.digit (4.2.0)
-        -->
-		<!--<alfresco.version>${alfresco_target_version}</alfresco.version>-->
-        
-        <!-- Defines the log level used in log4j.properties -->
-        <app.log.root.level>WARN</app.log.root.level>
-        
+
     </properties>
 
     <!-- Here we realize the connection with the Alfresco selected platform 
@@ -59,6 +63,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
     <!-- Following dependencies are needed for compiling Java code in src/main/java;  -->
     <dependencies>
         <dependency>
@@ -68,15 +73,44 @@
             <classifier>classes</classifier>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.springframework.extensions.surf</groupId>
-          <artifactId>spring-surf-api</artifactId>
-          <scope>provided</scope>
-        </dependency>        
+        <dependency>
+            <groupId>org.springframework.extensions.surf</groupId>
+            <artifactId>spring-surf-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <!-- Compress JavaScript files and store as *-min.js -->
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <version>1.5.1</version>
+                <configuration>
+                    <excludes>
+                        <exclude>alfresco/**/*.*</exclude>
+                        <exclude>**/*-min.js</exclude>
+                        <exclude>**/*.css</exclude>
+                    </excludes>
+                    <resources/>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>compress-js</id>
+                        <goals>
+                            <goal>compress</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
-    	<!-- Enterprise profile, manually activated, automatically adds support for Enterprise edition development (dependencies) -->
+        <!--
+            Brings in the extra Enterprise specific share classes,
+            if the 'enterprise' profile has been activated, needs to be activated manually. -->
         <profile>
             <id>enterprise</id>
             <dependencies>
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/messages/custom.properties b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/messages/custom.properties
new file mode 100644
index 00000000..602ae4ed
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/messages/custom.properties
@@ -0,0 +1,9 @@
+# This file should contain messages and labels specific to this share extension
+# Put here things like:
+#   Content Model Aspect and Type Labels
+#   Form field labels
+#   Doc lib Action labels and messages
+#   Doc Lib Action Forms labels
+#
+
+
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/example-widgets.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-data/extensions/example-widgets.xml
similarity index 100%
rename from archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/example-widgets.xml
rename to archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-data/extensions/example-widgets.xml
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.desc.xml
similarity index 100%
rename from archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml
rename to archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.desc.xml
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.html.ftl
similarity index 100%
rename from archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl
rename to archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.html.ftl
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.js
similarity index 100%
rename from archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js
rename to archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.js
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample
new file mode 100644
index 00000000..020aeb96
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:hz="http://www.hazelcast.com/schema/spring"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                http://www.hazelcast.com/schema/spring
+                http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.xsd">
+   
+   <!--
+    Define beans related to this Share extension here, such as
+     evaluators and resource bootstrapping.
+     
+     Note. Any configuration related to the whole Share.war webapp 
+           (i.e. not specific to this share extension) should be
+            placed in the environment specific config:
+             alfresco/tomcat/shared/classes/alfresco/web-extension/custom-slingshot-application-context.xml file
+   -->
+
+   <!-- Add extension specific messages and labels -->
+   <bean id="com.mycompany.share-amp.resources"
+         class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.messages.custom</value>
+         </list>
+      </property>
+   </bean>
+
+</beans>
\ No newline at end of file
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md
new file mode 100644
index 00000000..c6018967
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md
@@ -0,0 +1,4 @@
+## If you are overriding existing pages/components put these extension modules here.
+## If you are defining new extensions add them under resources/alfresco/site-data.
+##
+
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md
new file mode 100644
index 00000000..a6b158d2
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md
@@ -0,0 +1,4 @@
+## If you are overriding out-of-the-box Alfresco web scripts put these files here.
+## If you are defining new web scripts add them under resources/alfresco/site-webscripts.
+##
+
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample
index 3b082ec5..ac18c131 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample
@@ -1,423 +1,14 @@
-<!-- Alfresco 5.0.c share-config-custom.xml sample --> 
+<!-- Share configuration related to this particular Share module extension, such as:
+     - Doclib action config
+     - Form config
+     - Aspect and Type config
+
+    Note. Any configuration related to the whole Share.war webapp
+           (i.e. not specific to this share extension) should be
+            placed in the environment specific config:
+             alfresco/tomcat/shared/classes/alfresco/web-extension/share-config-custom.xml file
+     -->
 <alfresco-config>
 
-   <!-- Global config section -->
-   <config replace="true">
-      <flags>
-         <!--
-            Developer debugging setting to turn on DEBUG mode for client scripts in the browser
-         -->
-         <client-debug>false</client-debug>
 
-         <!--
-            LOGGING can always be toggled at runtime when in DEBUG mode (Ctrl, Ctrl, Shift, Shift).
-            This flag automatically activates logging on page load.
-         -->
-         <client-debug-autologging>false</client-debug-autologging>
-      </flags>
-   </config>
-   
-   <config evaluator="string-compare" condition="WebFramework">
-      <web-framework>
-         <!-- SpringSurf Autowire Runtime Settings -->
-         <!-- 
-              Developers can set mode to 'development' to disable; SpringSurf caches,
-              FreeMarker template caching and Rhino JavaScript compilation.
-         -->
-         <autowire>
-            <!-- Pick the mode: "production" or "development" -->
-            <mode>production</mode>
-         </autowire>
-
-         <!-- Allows extension modules with <auto-deploy> set to true to be automatically deployed -->
-         <module-deployment>
-            <mode>manual</mode>
-            <enable-auto-deploy-modules>true</enable-auto-deploy-modules>
-         </module-deployment>
-      </web-framework>
-   </config>
-
-   <!-- Disable the CSRF Token Filter -->
-   <!--
-   <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-      <filter/>
-   </config>
-   -->
-
-   <!--
-      To run the CSRF Token Filter behind 1 or more proxies that do not rewrite the Origin or Referere headers:
-
-      1. Copy the "CSRFPolicy" default config in share-security-config.xml and paste it into this file.
-      2. Replace the old config by setting the <config> element's "replace" attribute to "true" like below:
-         <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-      3. To every <action name="assertReferer"> element add the following child element
-         <param name="referer">http://www.proxy1.com/.*|http://www.proxy2.com/.*</param>
-      4. To every <action name="assertOrigin"> element add the following child element
-         <param name="origin">http://www.proxy1.com|http://www.proxy2.com</param>
-   -->
-
-   <!--
-      Remove the default wildcard setting and use instead a strict whitelist of the only domains that shall be allowed
-      to be used inside iframes (i.e. in the WebView dashlet on the dashboards)
-   -->
-   <!--
-   <config evaluator="string-compare" condition="IFramePolicy" replace="true">
-      <cross-domain>
-         <url>http://www.trusted-domain-1.com/</url>
-         <url>http://www.trusted-domain-2.com/</url>
-      </cross-domain>
-   </config>
-   -->
-
-   <!-- Turn off header that stops Share from being displayed in iframes on pages from other domains -->
-   <!--
-   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
-      <headers>
-         <header>
-            <name>X-Frame-Options</name>
-            <enabled>false</enabled>
-         </header>
-      </headers>
-   </config>
-   -->
-
-   <!-- Prevent browser communication over HTTP (for HTTPS servers) -->
-   <!--
-   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
-      <headers>
-         <header>
-            <name>Strict-Transport-Security</name>
-            <value>max-age=31536000</value>
-         </header>
-      </headers>
-   </config>
-   -->
-
-   <config evaluator="string-compare" condition="Replication">
-      <share-urls>
-         <!--
-            To discover a Repository Id, browse to the remote server's CMIS landing page at:
-              http://{server}:{port}/alfresco/service/cmis/index.html
-            The Repository Id field is found under the "CMIS Repository Information" expandable panel.
-
-            Example config entry:
-              <share-url repositoryId="622f9533-2a1e-48fe-af4e-ee9e41667ea4">http://new-york-office:8080/share/</share-url>
-         -->
-      </share-urls>
-   </config>
-
-   <!-- Document Library config section -->
-   <config evaluator="string-compare" condition="DocumentLibrary" replace="true">
-
-      <tree>
-         <!--
-            Whether the folder Tree component should enumerate child folders or not.
-            This is a relatively expensive operation, so should be set to "false" for Repositories with broad folder structures.
-         -->
-         <evaluate-child-folders>false</evaluate-child-folders>
-         
-         <!--
-            Optionally limit the number of folders shown in treeview throughout Share.
-         -->
-         <maximum-folder-count>1000</maximum-folder-count>
-         
-         <!--  
-            Default timeout in milliseconds for folder Tree component to recieve response from Repository
-         -->
-         <timeout>7000</timeout>
-      </tree>
-
-      <!--
-         Used by the "Manage Aspects" action
-
-         For custom aspects, remember to also add the relevant i18n string(s)
-            cm_myaspect=My Aspect
-      -->
-      <aspects>
-         <!-- Aspects that a user can see -->
-         <visible>
-            <aspect name="cm:generalclassifiable" />
-            <aspect name="cm:complianceable" />
-            <aspect name="cm:dublincore" />
-            <aspect name="cm:effectivity" />
-            <aspect name="cm:summarizable" />
-            <aspect name="cm:versionable" />
-            <aspect name="cm:templatable" />
-            <aspect name="cm:emailed" />
-            <aspect name="emailserver:aliasable" />
-            <aspect name="cm:taggable" />
-            <aspect name="app:inlineeditable" />
-            <aspect name="gd:googleEditable" />
-            <aspect name="cm:geographic" />
-            <aspect name="exif:exif" />
-            <aspect name="audio:audio" />
-            <aspect name="cm:indexControl" />
-            <aspect name="dp:restrictable" />
-         </visible>
-
-         <!-- Aspects that a user can add. Same as "visible" if left empty -->
-         <addable>
-         </addable>
-
-         <!-- Aspects that a user can remove. Same as "visible" if left empty -->
-         <removeable>
-         </removeable>
-      </aspects>
-
-      <!--
-         Used by the "Change Type" action
-
-         Define valid subtypes using the following example:
-            <type name="cm:content">
-               <subtype name="cm:mysubtype" />
-            </type>
-
-         Remember to also add the relevant i18n string(s):
-            cm_mysubtype=My SubType
-      -->
-      <types>
-         <type name="cm:content">
-         </type>
-
-         <type name="cm:folder">
-         </type>
- 
-         <type name="trx:transferTarget">
-            <subtype name="trx:fileTransferTarget" />
-         </type>
-      </types>
-
-      <!--
-         If set, will present a WebDAV link for the current item on the Document and Folder details pages.
-         Also used to generate the "View in Alfresco Explorer" action for folders.
-      -->
-      <repository-url>http://localhost:8080/alfresco</repository-url>
-
-      <!--
-         Google Docs integration
-      -->
-      <google-docs>
-         <!--
-            Enable/disable the Google Docs UI integration (Extra types on Create Content menu, Google Docs actions).
-         -->
-         <enabled>false</enabled>
-
-         <!--
-            The mimetypes of documents Google Docs allows you to create via the Share interface.
-            The I18N label is created from the "type" attribute, e.g. google-docs.doc=Google Docs&trade; Document
-         -->
-         <creatable-types>
-            <creatable type="doc">application/msword</creatable>
-            <creatable type="xls">application/vnd.ms-excel</creatable>
-            <creatable type="ppt">application/vnd.ms-powerpoint</creatable>
-         </creatable-types>
-      </google-docs>
-
-      <!--
-         File upload configuration
-      -->
-      <file-upload>
-         <!--
-            Adobe Flash™
-            In certain environments, an HTTP request originating from Flash cannot be authenticated using an existing session.
-            See: http://bugs.adobe.com/jira/browse/FP-4830
-            For these cases, it is useful to disable the Flash-based uploader for Share Document Libraries.
-         -->
-         <adobe-flash-enabled>true</adobe-flash-enabled>
-      </file-upload>
-   </config>
-
-
-   <!-- Custom DocLibActions config section -->
-   <config evaluator="string-compare" condition="DocLibActions">
-      <actionGroups>
-         <actionGroup id="document-browse">
-
-            <!-- Simple Repo Actions -->
-            <!--
-            <action index="340" id="document-extract-metadata" />
-            <action index="350" id="document-increment-counter" />
-            -->
-
-            <!-- Dialog Repo Actions -->
-            <!--
-            <action index="360" id="document-transform" />
-            <action index="370" id="document-transform-image" />
-            <action index="380" id="document-execute-script" />
-            -->
-
-         </actionGroup>
-      </actionGroups>
-   </config>
-
-   <!-- Global folder picker config section -->
-   <config evaluator="string-compare" condition="GlobalFolder">
-      <siteTree>
-         <container type="cm:folder">
-            <!-- Use a specific label for this container type in the tree -->
-            <rootLabel>location.path.documents</rootLabel>
-            <!-- Use a specific uri to retreive the child nodes for this container type in the tree -->
-            <uri>slingshot/doclib/treenode/site/{site}/{container}{path}?children={evaluateChildFoldersSite}&amp;max={maximumFolderCountSite}</uri>
-         </container>
-      </siteTree>
-   </config>
-
-   <!-- Repository Library config section -->
-   <config evaluator="string-compare" condition="RepositoryLibrary" replace="true">
-      <!--
-         Root nodeRef or xpath expression for top-level folder.
-         e.g. alfresco://user/home, /app:company_home/st:sites/cm:site1
-         If using an xpath expression, ensure it is properly ISO9075 encoded here.
-      -->
-      <root-node>alfresco://company/home</root-node>
-
-      <tree>
-         <!--
-            Whether the folder Tree component should enumerate child folders or not.
-            This is a relatively expensive operation, so should be set to "false" for Repositories with broad folder structures.
-         -->
-         <evaluate-child-folders>false</evaluate-child-folders>
-         
-         <!--
-            Optionally limit the number of folders shown in treeview throughout Share.
-         -->
-         <maximum-folder-count>500</maximum-folder-count>
-      </tree>
-
-      <!--
-         Whether the link to the Repository Library appears in the header component or not.
-      -->
-      <visible>true</visible>
-   </config>
-   
-   <!-- Kerberos settings -->
-   <!-- To enable kerberos rename this condition to "Kerberos" -->
-   <config evaluator="string-compare" condition="KerberosDisabled" replace="true">
-      <kerberos>
-         <!--
-            Password for HTTP service account.
-            The account name *must* be built from the HTTP server name, in the format :
-               HTTP/<server_name>@<realm>
-            (NB this is because the web browser requests an ST for the
-            HTTP/<server_name> principal in the current realm, so if we're to decode
-            that ST, it has to match.)
-         -->
-         <password>secret</password>
-         <!--
-            Kerberos realm and KDC address.
-         -->
-         <realm>ALFRESCO.ORG</realm>
-         <!--
-            Service Principal Name to use on the repository tier.
-            This must be like: HTTP/host.name@REALM
-         -->
-         <endpoint-spn>HTTP/repository.server.com@ALFRESCO.ORG</endpoint-spn>
-         <!--
-            JAAS login configuration entry name.
-         -->
-         <config-entry>ShareHTTP</config-entry>
-      </kerberos>
-   </config>
-
-   <!-- Uncomment and modify the URL to Activiti Admin Console if required. -->
-   <!--
-   <config evaluator="string-compare" condition="ActivitiAdmin" replace="true">
-      <activiti-admin-url>http://localhost:8080/alfresco/activiti-admin</activiti-admin-url>
-   </config>
-   -->
-
-   <config evaluator="string-compare" condition="Remote">
-      <remote>
-         <endpoint>
-            <id>alfresco-noauth</id>
-            <name>Alfresco - unauthenticated access</name>
-            <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
-            <connector-id>alfresco</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
-            <identity>none</identity>
-         </endpoint>
-
-         <endpoint>
-            <id>alfresco</id>
-            <name>Alfresco - user access</name>
-            <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-            <connector-id>alfresco</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
-            <identity>user</identity>
-         </endpoint>
-
-         <endpoint>
-            <id>alfresco-feed</id>
-            <name>Alfresco Feed</name>
-            <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
-            <connector-id>http</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
-            <basic-auth>true</basic-auth>
-            <identity>user</identity>
-         </endpoint>
-         
-         <endpoint>
-            <id>activiti-admin</id>
-            <name>Activiti Admin UI - user access</name>
-            <description>Access to Activiti Admin UI, that requires user authentication</description>
-            <connector-id>activiti-admin-connector</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/activiti-admin</endpoint-url>
-            <identity>user</identity>
-         </endpoint>
-      </remote>
-   </config>
-
-   <!-- 
-        Overriding endpoints to reference an Alfresco server with external SSO enabled
-        NOTE: If utilising a load balancer between web-tier and repository cluster, the "sticky
-              sessions" feature of your load balancer must be used.
-        NOTE: If alfresco server location is not localhost:8080 then also combine changes from the
-              "example port config" section below.
-        *Optional* keystore contains SSL client certificate + trusted CAs.
-        Used to authenticate share to an external SSO system such as CAS
-        Remove the keystore section if not required i.e. for NTLM.
-        
-        NOTE: For Kerberos SSO rename the "KerberosDisabled" condition above to "Kerberos"
-        
-        NOTE: For external SSO, switch the endpoint connector to "AlfrescoHeader" and set
-              the userHeader to the name of the HTTP header that the external SSO
-              uses to provide the authenticated user name.
-   -->
-   <!--
-   <config evaluator="string-compare" condition="Remote">
-      <remote>
-         <keystore>
-             <path>alfresco/web-extension/alfresco-system.p12</path>
-             <type>pkcs12</type>
-             <password>alfresco-system</password>
-         </keystore>
-         
-         <connector>
-            <id>alfrescoCookie</id>
-            <name>Alfresco Connector</name>
-            <description>Connects to an Alfresco instance using cookie-based authentication</description>
-            <class>org.alfresco.web.site.servlet.SlingshotAlfrescoConnector</class>
-         </connector>
-         
-         <connector>
-            <id>alfrescoHeader</id>
-            <name>Alfresco Connector</name>
-            <description>Connects to an Alfresco instance using header and cookie-based authentication</description>
-            <class>org.alfresco.web.site.servlet.SlingshotAlfrescoConnector</class>
-            <userHeader>SsoUserHeader</userHeader>
-         </connector>
-
-         <endpoint>
-            <id>alfresco</id>
-            <name>Alfresco - user access</name>
-            <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-            <connector-id>alfrescoCookie</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/wcs</endpoint-url>
-            <identity>user</identity>
-            <external-auth>true</external-auth>
-         </endpoint>
-      </remote>
-   </config>
-   -->
-   
-</alfresco-config>
+</alfresco-config>
\ No newline at end of file
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml
index 3b5c18af..b27972ca 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml
@@ -3,8 +3,16 @@
       <config evaluator="string-compare" condition="WebFramework">
            <web-framework>
                <autowire>
-                   <mode>development</mode>
+                   <!-- Changing this to 'development' currently breaks the Admin Console so it does not work correctly.
+                        During testing we instead disable JS compilation by overriding bean javaScriptProcessor -->
+                   <mode>production</mode>
                </autowire>
+
+               <!--
+                    If resource caching has been disabled then all the dependency caches will be cleared
+                    before processing the Aikau jsonModel request...
+                       (i.e. this.dojoDependencyHandler.clearCaches() )
+               -->
                <disable-resource-caching>true</disable-resource-caching>
            </web-framework>
        </config>
@@ -25,12 +33,18 @@
         </flags>
     </config>
 
-    <!-- Disable CSRF completely for now -->
-    <!-- It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy -->
+    <!--
+        Disable CSRF completely for now
+        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
+        -->
     <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-	<filter/>
+	    <filter/>
     </config>
 
+    <!--
+        Change so it is picked up from property where the Alfresco Repo Webapp is running
+        (e.g. http://localhost:8080/alfresco)
+        -->
     <config evaluator="string-compare" condition="Remote">
         <remote>
             <endpoint>
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
index bf4a4721..280996b9 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
@@ -1,5 +1,7 @@
-# This is a full override of Alfresco 4.2.b log4j.properties
-# This file overwrites the alfresco.war log4j.properties
+# This file is copied from Alfresco Share 5.0.d
+# Overrides tomcat/webapps/share/WEB-INF/classes/log4j,properties
+# and sets new file location from property and log level from property.
+#
 
 # Set root logger level to error
 log4j.rootLogger=${app.log.root.level}, Console, File
@@ -11,7 +13,7 @@ log4j.appender.Console=org.apache.log4j.ConsoleAppender
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
 
 # use log4j NDC to replace %x with tenant domain / username
-log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
+log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n
 #log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
 
 ###### File appender definition #######
@@ -20,27 +22,7 @@ log4j.appender.File.File=${app.log.dir}alfresco.log
 log4j.appender.File.Append=true
 log4j.appender.File.DatePattern='.'yyyy-MM-dd
 log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-###### Hibernate specific appender definition #######
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-###### Log level overrides #######
-
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
-log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-log4j.logger.org.hibernate.type=warn
-log4j.logger.org.hibernate.cfg.SettingsFactory=warn
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
 
 # Spring
 log4j.logger.org.springframework=warn
@@ -48,219 +30,23 @@ log4j.logger.org.springframework=warn
 log4j.logger.org.springframework.remoting.support=error
 log4j.logger.org.springframework.util=error
 
-# Axis/WSS4J
-log4j.logger.org.apache.axis=info
-log4j.logger.org.apache.ws=info
-
-# CXF
-log4j.logger.org.apache.cxf=error
-
 # MyFaces
 log4j.logger.org.apache.myfaces.util.DebugUtils=info
 log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
 log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
 log4j.logger.org.apache.myfaces.taglib=error
 
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
-# log prepared statement cache activity ###
-log4j.logger.org.hibernate.ps.PreparedStatementCache=info
-
 # Alfresco
 log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.repo.admin=info
-log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
-log4j.logger.org.alfresco.repo.model.filefolder=warn
-log4j.logger.org.alfresco.repo.tenant=info
-log4j.logger.org.alfresco.repo.avm=info
 log4j.logger.org.alfresco.config=warn
 log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
-log4j.logger.org.alfresco.repo.management.subsystems=warn
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
-log4j.logger.org.alfresco.repo.security.sync=info
-log4j.logger.org.alfresco.repo.security.person=info
-
-log4j.logger.org.alfresco.sample=info
 log4j.logger.org.alfresco.web=info
-#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-#log4j.logger.org.alfresco.web.bean.clipboard=debug
-log4j.logger.org.alfresco.repo.webservice=info
-log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-#log4j.logger.org.alfresco.web.page=debug
-
-log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
-
-log4j.logger.org.alfresco.web.ui.common.Utils=error
-#log4j.logger.org.alfresco.web.ui.common.Utils=info
-
-log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
-log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
-
-# Specific patches
-log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
-log4j.logger.org.alfresco.repo.version.VersionMigrator=info
-log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info
-
-log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
-log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
-log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
-log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
-log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
-log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
-log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
-log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
-log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
-log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
-log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
-log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info
-log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
-
-#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-
-log4j.logger.org.alfresco.repo.workflow=info
-
-# CIFS server debugging
-log4j.logger.org.alfresco.smb.protocol=error
-#log4j.logger.org.alfresco.smb.protocol.auth=debug
-#log4j.logger.org.alfresco.acegi=debug
-
-# FTP server debugging
-log4j.logger.org.alfresco.ftp.protocol=error
-#log4j.logger.org.alfresco.ftp.server=debug
-
-# WebDAV debugging
-#log4j.logger.org.alfresco.webdav.protocol=debug
-log4j.logger.org.alfresco.webdav.protocol=error
-
-# NTLM servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
-
-# Kerberos servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
-
-# File servers
-log4j.logger.org.alfresco.fileserver=warn
-
-# Repo filesystem debug logging
-#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
-
-# AVM filesystem debug logging
-#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-log4j.logger.org.alfresco.repo.node.integrity=ERROR
-
-# Indexer debugging
-log4j.logger.org.alfresco.repo.search.Indexer=error
-#log4j.logger.org.alfresco.repo.search.Indexer=debug
-
-log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
-#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
-
-# Audit debugging
-# log4j.logger.org.alfresco.repo.audit=DEBUG
-# log4j.logger.org.alfresco.repo.audit.model=DEBUG
-
-# Forms debugging
-# log4j.logger.org.alfresco.web.forms=debug
-# log4j.logger.org.chiba.xml.xforms=debug
-log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error
-log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-log4j.logger.alfresco.missingProperties=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn
-#log4j.logger.org.alfresco.web.ui.repo.component.property=debug
-
-# Dictionary/Model debugging
-log4j.logger.org.alfresco.repo.dictionary=warn
-log4j.logger.org.alfresco.repo.dictionary.types.period=warn
-
-# Virtualization Server Registry
-log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
-
-# Spring context runtime property setter
-log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
-
-# Debugging options for clustering
-log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
-log4j.logger.org.alfresco.repo.content.replication=error
-
-#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
-
-# Activity service
-log4j.logger.org.alfresco.repo.activities=warn
-
-# User usage tracking
-log4j.logger.org.alfresco.repo.usage=info
-
-# Sharepoint
-log4j.logger.org.alfresco.module.vti=info
-
-# Forms Engine
-log4j.logger.org.alfresco.repo.forms=info
-log4j.logger.org.alfresco.web.config.forms=info
-log4j.logger.org.alfresco.web.scripts.forms=info
-
-# CMIS
-log4j.logger.org.alfresco.opencmis=error
-log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
-log4j.logger.org.alfresco.cmis=error
-log4j.logger.org.alfresco.cmis.dictionary=warn
-log4j.logger.org.apache.chemistry.opencmis=info
-
-# IMAP
-log4j.logger.org.alfresco.repo.imap=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
-log4j.logger.org.jbpm.graph.def.GraphElement=fatal
-
-#log4j.logger.org.alfresco.repo.googledocs=debug
-
-###### Scripting #######
 
 # Web Framework
 log4j.logger.org.springframework.extensions.webscripts=info
 log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
 log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
 
-# Repository
-log4j.logger.org.alfresco.repo.web.scripts=warn
-log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
-log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
-log4j.logger.org.alfresco.repo.jscript=error
-log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
-log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
-
-log4j.logger.org.alfresco.repo.avm.actions=info
-
 # Freemarker
 # Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-# Metadata extraction
-log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
-
-# Reduces PDFont error level due to ALF-7105
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
-
-# no index support
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
-log4j.logger.org.alfresco.demoamp.test=DEBUG
\ No newline at end of file
+log4j.logger.freemarker.runtime=
\ No newline at end of file
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
index 5920f8e3..a5347d33 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context docBase="${alfresco.client.war.folder}" path="${alfresco.client.contextPath}">
-
+<!-- Setup docBase to something like share-amp/target/share-amp-war
+     and path to /share -->
+<Context docBase="${app.amp.client.war.folder}" path="${share.client.contextPath}">
 
   <Resources className="org.apache.naming.resources.VirtualDirContext"
     extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
@@ -9,16 +10,7 @@
     <Loader searchVirtualFirst="true" className="org.apache.catalina.loader.VirtualWebappLoader"
     virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
   
-  <!-- 
-  <Environment override="false" type="java.lang.Boolean" name="properties/startup.enable" description="A flag that globally enables or disables startup of the major Alfresco subsystems." value="true"/>
-  <Environment override="false" type="java.lang.String" name="properties/dir.root" description="The filesystem directory below which content and index data is stored. Should be on a shared disk if this is a clustered installation."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.dialect" 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"/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.query.substitutions" description="Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to &quot;true TRUE, false FALSE&quot;."/>
-  <Environment override="false" type="java.lang.Boolean" name="properties/hibernate.jdbc.use_get_generated_keys" 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."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.default_schema" 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."/>
-   -->
-   
-  <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources --> 
+  <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources -->
   <JarScanner scanAllDirectories="true" />
   
 </Context>
diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml
index 9e672af8..f4dc8f17 100644
--- a/modules/alfresco-rad/pom.xml
+++ b/modules/alfresco-rad/pom.xml
@@ -91,7 +91,7 @@
                                </includes>
                                <targetPath>alfresco/ibatis/org.hibernate.dialect.H2Dialect</targetPath>
                            </resource>
-                           <!-- Upgrade scripts
+                           <!-- Upgrade scripts - does not seem to be picked up, so any changes you would make to them are not picked up...
                            <resource>
                                <directory>${pgsql.dialect.folder}/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect</directory>
                                <includes>
diff --git a/pom.xml b/pom.xml
index 5c54ee6d..a304f3ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
         <springloaded.version>1.2.3.RELEASE</springloaded.version>
         <scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>
     </properties>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -165,7 +166,6 @@
         </extensions>
     </build>
 
-
     <repositories>
         <repository>
             <id>alfresco-public</id>
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 9a2001a7..145bd637 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -1,179 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <artifactId>alfresco-sdk-parent</artifactId>
-  <name>Maven Alfresco SDK - Parent POM</name>
-  <description>
-     The Maven Alfresco SDK Parent POM exposes the developer features of the Maven Alfresco SDK.
-     Declare this POM as parent for your project and select the Alfresco version/edition by defining
-     the alfresco.groupId and alfresco.version in your POM.
-  </description>
-  <packaging>pom</packaging>
+<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>
+    <artifactId>alfresco-sdk-parent</artifactId>
+    <name>Maven Alfresco SDK - Parent POM</name>
+    <description>
+        The Maven Alfresco SDK Parent POM exposes the developer features of the Maven Alfresco SDK.
+        Declare this POM as parent for your project and select the Alfresco version/edition by defining
+        the alfresco.groupId and alfresco.version in your POM.
+    </description>
+    <packaging>pom</packaging>
 
-  <!-- This parent is only needed for SDK release purposes. It does not add behaviors -->
-  <parent>
-    <groupId>org.alfresco.maven</groupId>
-    <artifactId>alfresco-sdk-aggregator</artifactId>
+    <!-- This parent is only needed for SDK release purposes. It does not add behaviors -->
+    <parent>
+        <groupId>org.alfresco.maven</groupId>
+        <artifactId>alfresco-sdk-aggregator</artifactId>
+        <version>2.0.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <!-- This defines the version of the SDK in terms of features -->
     <version>2.0.1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <!-- This defines the version of the SDK in terms of features -->
-  <version>2.0.1-SNAPSHOT</version>
 
 
-  <properties>
-    <!--  Default Alfresco version this SDK version has been tested with:
-        |
-        | alfresco.groupId can be
-        | org.alfresco ==> Alfresco Community/Enterprise (post alfresco 4.2)
-        | org.alfresco.enterprise ==> Alfresco Enterprise (pre Alfresco 4.2)
-        |
-        | NOTE: You can / should override these properties in you POM to select the proper version
-        |
-        | For available versions please search on https://artifacts.alfresco.com/nexus/index.html
+    <properties>
+        <!--
+            The build will use an Alfresco Community Version by default.
+            Enable the 'enterprise' profile to use an Alfresco Enterprise version instead.
+            For available community versions see:
+                https://artifacts.alfresco.com/nexus/content/groups/public/org/alfresco/alfresco/
+            -->
+        <alfresco.groupId>org.alfresco</alfresco.groupId>
+        <alfresco.version>${alfresco.community.default.version}</alfresco.version>
+        <alfresco.repo.artifactId>alfresco</alfresco.repo.artifactId>
+        <alfresco.share.artifactId>share</alfresco.share.artifactId>
+
+        <!-- Alfresco Webapp context paths.
+            Note. what used to be the Alfresco Explorer UI (/alfresco)
+                  is now just an info page as this UI has been removed.
+            -->
+        <alfresco.client.contextPath>/alfresco</alfresco.client.contextPath>
+        <share.client.contextPath>/share</share.client.contextPath>
+
+        <!-- This is the name of the Alfresco data folder.
+             Configured in alfresco-global.properties with the 'dir.root' property.
+             This folder will contain all content files, index files, and database with metadata when running embedded.
+             (this folder is relative to the top folder in the project) -->
+        <alfresco.data.location>alf_data_dev</alfresco.data.location>
+
+        <!-- Alfresco Repo Database configuration.
+             By default it uses a flat file H2 database to be able to run embedded.
+             The H2 database implementation is brought in via the tomcat7-maven-plugin as a dependency.
+             The data files for the H2 database will be created in a relative path, such as alf_data_dev/h2_data/alf_dev,
+             see alfresco.db.url below.
+             For more information about the db parameters see:http://www.h2database.com/html/features.html
+          -->
+        <alfresco.db.name>alf_dev</alfresco.db.name>
+        <alfresco.db.username>alfresco</alfresco.db.username>
+        <alfresco.db.password>alfresco</alfresco.db.password>
+        <alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0
+        </alfresco.db.params>
+        <alfresco.db.url>jdbc:h2:./${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params}</alfresco.db.url>
+        <alfresco.db.datasource.class>org.h2.jdbcx.JdbcDataSource</alfresco.db.datasource.class>
+
+        <!--
+            Alfresco Module Packages (AMP) settings
+            -->
+        <app.amp.folder>src/main/amp</app.amp.folder> <!-- To know which resource folder to filter for AMP extension projects -->
+        <app.amp.output.folder>../${project.build.finalName}</app.amp.output.folder> <!-- To know which folder filtered AMP resources should end up in -->
+        <app.amp.overlay.excludes/> <!-- AMP excludes when installing into a WAR, by default empty (i.e. everything is included) -->
+        <app.amp.excludes/> <!-- Empty AMP source excludes by default, see the amp-to-war profile for usage example -->
+
+        <!--
+            Settings related to the stand-alone AMP extension projects.
+             Note. Not applicable to the all-in-one project, which has separate projects for Alfresco.war and Share.war.
+            -->
+        <!-- This points to where the WAR is assembled with the AMP applied when running embedded.
+             We set the docBase for the virtual webapp context to this folder so we can easily detect changes while running.
+             For example:
+                my-repo-amp/target/my-repo-amp-war  (Alfresco.war extension)
+                my-share-amp/target/my-share-amp-war  (Share.war extension)
+             -->
+        <app.amp.client.war.folder>${project.build.directory}/${project.build.finalName}-war</app.amp.client.war.folder>
+        <!-- The Maven artifact ID to use when loading the WAR that the AMP should be applied to,
+             defaults to the alfresco.war artifact ID, overriding this in the share-amp project. -->
+        <app.amp.client.war.artifactId>${alfresco.repo.artifactId}</app.amp.client.war.artifactId>
+
+        <!--
+            Environment specific property files related to the Alfresco Repo configuration (Alfresco.war).
+            By default there is a 'local' environment configured with an alfresco-global.properties
+            file in the following places:
+                alfresco-allinone/repo/src/main/properties/local/alfresco-global.properties
+                alfresco-allinone/repo-amp/src/test/properties/local/alfresco-global.properties
+                alfresco-amp/src/test/properties/local/alfresco-global.properties
+            To setup a new environment such as 'ci' (Continues Integration), create a new directory under /properties:
+                alfresco-allinone/repo/src/main/properties/ci/alfresco-global.properties
+                alfresco-allinone/repo-amp/src/test/properties/ci/alfresco-global.properties
+                alfresco-amp/src/test/properties/ci/alfresco-global.properties
+            Change the property values in the files as needed.
+            And when the CI server builds the project supply the environment specific setting as follows:
+                $mvn clean integration-test -Denv=ci
         -->
-    <alfresco.groupId>org.alfresco</alfresco.groupId>
-    <alfresco.version>${alfresco.community.default.version}</alfresco.version>
-    <!-- By default uses community artifacts (alfresco|share). Overridden in the 'enterprise' profile, with 'alfresco-enterprise' and 'share-enterprise' -->
-    <alfresco.repo.artifactId>alfresco</alfresco.repo.artifactId>
-    <alfresco.share.artifactId>share</alfresco.share.artifactId>
+        <env>local</env>
+        <app.properties.folder>src/main/properties/${env}</app.properties.folder>
+        <app.properties.test.folder>src/test/properties/${env}</app.properties.test.folder>
+        <app.properties.include>**</app.properties.include>
+        <app.properties.test.include>**</app.properties.test.include>
 
-    <!--  Values can be "alfresco" or "share". Default value is 'alfresco' assuming you are developing a repository AMP, change to share for share AMPs
-        | This impact (in AMP projects) the choice of the WAR project for embedded run
-         -->
-    <alfresco.client.war>${alfresco.repo.artifactId}</alfresco.client.war>
-    <alfresco.client.war.groupId>${alfresco.groupId}</alfresco.client.war.groupId>
-    <alfresco.client.war.version>${alfresco.version}</alfresco.client.war.version>
-    
-    <!-- IMPORTANT! Override this only if you know what you're doing; it could break amp-to-war overlay -->
-    <alfresco.client.war.folder>${project.build.directory}/${project.build.finalName}-war</alfresco.client.war.folder>
+        <!--  Turns on/off POM properties filtering globally. By default filtering is on.
+              This can be overridden in your POM, but do it at your own risk
+              as it may break SDK functionalities
+             -->
+        <app.filtering.enabled>true</app.filtering.enabled>
+        <app.testing.jvm.args>-Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en</app.testing.jvm.args>
 
-    <!-- Alfresco Repo disk storage folder (relative path) -->
-    <alfresco.data.location>alf_data_dev</alfresco.data.location>
+        <!--  Logging in project's target folder by default
+              NOTE: Remember the trailing slash when overriding this.
+             -->
+        <app.log.dir>${project.build.directory}/</app.log.dir>
+        <app.log.root.level>WARN</app.log.root.level>
 
-    <!-- Alfresco Repo configuration with embedded DB -->
-    <alfresco.db.name>alf_dev</alfresco.db.name>
-    <alfresco.db.username>alfresco</alfresco.db.username>
-    <alfresco.db.password>alfresco</alfresco.db.password>
-      <!--
-      AUTO_SERVER=TRUE: Multiple processes can access the same database without having to start the server manually.
-                        Such as multiple internal Alfresco connections and for example SQuirreL externally,
+        <!-- Needed for community to avoid weird logging exceptions -->
+        <app.slf4j.scope>runtime</app.slf4j.scope>
+        <app.slf4j.version>1.5.11</app.slf4j.version>
 
-                        If you don't use it you will see errors such as:
-                        "java.util.concurrent.ExecutionException: java.lang.RuntimeException: org.h2.jdbc.JdbcSQLException:
-                         Database may be already in use: "all-in-one-test/alf_data_dev/h2_data/alf_dev.mv.db".
-                         Possible solutions: close all other connection(s); use the server mode [90020-186]"
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-      DB_CLOSE_ON_EXIT=FALSE: Don't manually close the database when the JVM exists.
+        <!-- Maven Plugins Versions used by the SDK -->
+        <maven.compiler.version>3.2</maven.compiler.version>
+        <maven.clean.version>2.6.1</maven.clean.version>
+        <maven.dependency.version>2.9</maven.dependency.version>
+        <maven.enforcer.plugin>1.3.1</maven.enforcer.plugin>
+        <maven.resources.version>2.7</maven.resources.version>
+        <maven.surefire.version>2.18</maven.surefire.version>
+        <maven.install.version>2.5.2</maven.install.version>
+        <maven.jar.version>2.5</maven.jar.version>
+        <maven.war.version>2.5</maven.war.version>
+        <maven.antrun.version>1.7</maven.antrun.version>
+        <maven.release.version>2.5.1</maven.release.version>
+        <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
+        <maven.replacer.version>1.5.3</maven.replacer.version>
+        <maven.tomcat.version>2.2</maven.tomcat.version>
 
-                        If you don't use it you will see errors such as:
-                        "[factory.support.DisposableBeanAdapter] [localhost-startStop-2] Invocation of destroy method
-                        'close' failed on bean with name 'repoSqlSessionTemplate': java.lang.UnsupportedOperationException:
-                        Manual close is not allowed over a Spring managed SqlSession"
+        <!-- This is used for the site deployment procedure (override in your POM as needed) -->
+        <stagingDirectory>../../target/staging/poms/alfresco-sdk-parent</stagingDirectory>
 
+        <!-- This is used to set the version for the following Alfresco artifacts:
+              - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin)
+              - Alfresco Rapid Application Development module (alfresco-rad)
+        -->
+        <maven.alfresco.version>2.0.1-SNAPSHOT</maven.alfresco.version>
 
-      The following 2 properties are needed to avoid cryptic node not found exceptions:
-        MVCC=FALSE: Multi-Version Concurrency Control disabled, enabling it means LOCK_MODE has no effect.
-        LOCK_MODE=0: Read Uncommitted, this level means that transaction isolation is disabled.
-      -->
-    <alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0</alfresco.db.params>
+        <!-- Sets the H2 Database version to use.
+             Note. Upgrading to 1.4.186 did not work, on second start (after initial db creation etc) it will not connect... -->
+        <h2.version>1.4.185</h2.version>
+    </properties>
 
-    <!-- H2 flat file database will be created in a relative path, such as alf_data_dev/h2_data/alf_dev-->
-    <alfresco.db.url>jdbc:h2:./${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params}</alfresco.db.url>
-    <alfresco.db.datasource.class>org.h2.jdbcx.JdbcDataSource</alfresco.db.datasource.class>
-
-    <!-- SDK Properties -->
     <!--
-    Built-in multi-environment property placeholding support (also for testing); to enable it on your sub-modules
-    * create app.properties.folder (default=src/main/properties/${env}) folder structure
-    * place properties files in that folder with the correct name
-    Both 'alfresco' and 'share' sub-modules currently use it.
-    -->
-    <env>local</env>
-    <!--  Be default we assume to we load all properties files under ${app.properties.folder}
-        | and
-        | This can be overridden your pom
-     -->
-    <app.amp.folder>src/main/amp</app.amp.folder>
-    <app.amp.output.folder>../${project.build.finalName}</app.amp.output.folder>
-    <!-- AMP excludes when installing into a WAR, by default empty (i.e. everything is included) -->
-    <app.amp.overlay.excludes />
-    <!-- Empty AMP source excludes by default, see the amp-to-war profile for usage example -->
-    <app.amp.excludes />
-    <app.properties.folder>src/main/properties/${env}</app.properties.folder>
-    <app.properties.test.folder>src/test/properties/${env}</app.properties.test.folder>
-    <app.properties.include>**</app.properties.include>
-    <app.properties.test.include>**</app.properties.test.include>
-
-    <!--  Turns on/off POM properties filtering globally. By default filtering is on.
-        | This can be overridden in your POM, but do it at your own risk
-        | as it may break SDK functionalities
-         -->
-    <app.filtering.enabled>true</app.filtering.enabled>
-    <app.testing.jvm.args>-Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en</app.testing.jvm.args>
-
-    <!--  Logging in project's target folder by default
-        | NOTE: Remember the trailing slash when overriding this.
-         -->
-    <app.log.dir>${project.build.directory}/</app.log.dir>
-    <app.log.root.level>WARN</app.log.root.level>
-    
-    <!-- Needed for community to avoid weird logging exceptions -->
-    <app.slf4j.scope>runtime</app.slf4j.scope>
-    <app.slf4j.version>1.5.11</app.slf4j.version>
-
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-    <!-- Maven Plugins Versions used by the SDK -->
-    <maven.compiler.version>3.2</maven.compiler.version>
-    <maven.clean.version>2.6.1</maven.clean.version>
-    <maven.dependency.version>2.9</maven.dependency.version>
-    <maven.enforcer.plugin>1.3.1</maven.enforcer.plugin>
-    <maven.resources.version>2.7</maven.resources.version>
-    <maven.surefire.version>2.18</maven.surefire.version>
-    <maven.install.version>2.5.2</maven.install.version>
-    <maven.jar.version>2.5</maven.jar.version>
-    <maven.war.version>2.5</maven.war.version>
-    <maven.antrun.version>1.7</maven.antrun.version>
-    <maven.release.version>2.5.1</maven.release.version>
-    <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
-    <maven.replacer.version>1.5.3</maven.replacer.version>
-    <maven.tomcat.version>2.2</maven.tomcat.version>
-
-    <!-- This is used for the site deployment procedure (override in your POM as needed) -->
-    <stagingDirectory>../../target/staging/poms/alfresco-sdk-parent</stagingDirectory>
-
-    <!-- Maven Alfresco plugin in use throughout the SDK -->
-    <maven.alfresco.version>2.0.1-SNAPSHOT</maven.alfresco.version>
-
-    <!-- Note. Upgrading to 1.4.186 did not work, on second start (after initial db creation etc) it will not connect... -->
-    <h2.version>1.4.185</h2.version>
-
-    <junit.version>4.11</junit.version>
-    <maven.jetty.version>7.4.0.v20110414</maven.jetty.version>
-  </properties>
-
-  <!-- This repository is only needed to retrieve Alfresco parent POM. 
-        NOTE: This can be removed when/if Alfresco will be on Maven Central 
-        
-        NOTE: The repository to be used for Alfresco Enterprise artifacts is
-        https://artifacts.alfresco.com/nexus/content/groups/private/. Please check
-        with Alfresco Support to get credentials to add to your ~/.m2/settings.xml
-        if you are a Enterprise customer or Partner  
-        -->
+          Alfresco Public releases and snapshot repositories (For community version, see also 'enterprise' profile).
+          NOTE: This can be removed when/if Alfresco will be on Maven Central
+          -->
     <repositories>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <name>Sonatype Snapshot Repo</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
         <repository>
             <id>alfresco-public</id>
             <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
@@ -186,758 +173,925 @@
                 <updatePolicy>daily</updatePolicy>
             </snapshots>
         </repository>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <name>Sonatype Snapshot Repo</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>daily</updatePolicy>
-      </snapshots>
-    </pluginRepository>
-    <pluginRepository>
-      <id>alfresco-plugin-public</id>
-      <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>alfresco-plugin-public-snapshots</id>
-      <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>daily</updatePolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>sonatype-public</id>
+            <url>http://oss.sonatype.org/content/groups/public</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>alfresco-plugin-public</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>alfresco-plugin-public-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
 
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.alfresco.maven.plugin</groupId>
-          <artifactId>alfresco-maven-plugin</artifactId>
-          <version>${maven.alfresco.version}</version>
-          <extensions>true</extensions>
-          <configuration>
-              <snapshotToTimestamp>true</snapshotToTimestamp>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven.compiler.version}</version>
-          <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>${maven.resources.version}</version>
-          <configuration>
-            <encoding>UTF-8</encoding>
-            <nonFilteredFileExtensions>
-              <nonFilteredFileExtension>ftl</nonFilteredFileExtension>
-              <nonFilteredFileExtension>acp</nonFilteredFileExtension>
-              <nonFilteredFileExtension>jpg</nonFilteredFileExtension>
-              <nonFilteredFileExtension>png</nonFilteredFileExtension>
-              <nonFilteredFileExtension>gif</nonFilteredFileExtension>
-              <nonFilteredFileExtension>svg</nonFilteredFileExtension>
-              <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
-              <nonFilteredFileExtension>doc</nonFilteredFileExtension>
-              <nonFilteredFileExtension>docx</nonFilteredFileExtension>
-              <nonFilteredFileExtension>xls</nonFilteredFileExtension>
-              <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
-              <nonFilteredFileExtension>ppt</nonFilteredFileExtension>
-              <nonFilteredFileExtension>pptx</nonFilteredFileExtension>
-              <nonFilteredFileExtension>bin</nonFilteredFileExtension>
-              <nonFilteredFileExtension>lic</nonFilteredFileExtension>
-              <nonFilteredFileExtension>swf</nonFilteredFileExtension>
-              <nonFilteredFileExtension>zip</nonFilteredFileExtension>
-              <nonFilteredFileExtension>msg</nonFilteredFileExtension>
-              <nonFilteredFileExtension>jar</nonFilteredFileExtension>
-              <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
-              <nonFilteredFileExtension>eot</nonFilteredFileExtension>
-              <nonFilteredFileExtension>woff</nonFilteredFileExtension>
-              <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
-            </nonFilteredFileExtensions>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>${maven.war.version}</version>
-          <configuration>
-            <archiveClasses>false</archiveClasses>
-            <archive>
-                <manifest>
-                    <addClasspath>true</addClasspath>
-                </manifest>
-            </archive>
-          </configuration>
-          <dependencies>
-                <dependency>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <pluginManagement>
+            <plugins>
+                <plugin>
                     <groupId>org.alfresco.maven.plugin</groupId>
                     <artifactId>alfresco-maven-plugin</artifactId>
                     <version>${maven.alfresco.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-archiver</artifactId>
-                    <version>2.3</version>
-                </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>${maven.clean.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>${maven.dependency.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven.surefire.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>${maven.install.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>${maven.jar.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>${maven.antrun.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>com.google.code.maven-replacer-plugin</groupId>
-          <artifactId>replacer</artifactId>
-          <version>${maven.replacer.version}</version>
-        </plugin>
-        <!-- Configures tomcat with proper deps and performance fixes -->
-        <plugin>
-            <groupId>org.apache.tomcat.maven</groupId>
-            <artifactId>tomcat7-maven-plugin</artifactId>
-            <version>${maven.tomcat.version}</version>
-            <configuration>
-                <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-            </configuration>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <snapshotToTimestamp>true</snapshotToTimestamp>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven.compiler.version}</version>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>${maven.resources.version}</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                        <nonFilteredFileExtensions>
+                            <nonFilteredFileExtension>ftl</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>acp</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>jpg</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>png</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>gif</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>svg</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>doc</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>docx</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>ppt</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>pptx</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>bin</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>lic</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>swf</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>msg</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>eot</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+                        </nonFilteredFileExtensions>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven.war.version}</version>
+                    <configuration>
+                        <archiveClasses>false</archiveClasses>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.alfresco.maven.plugin</groupId>
+                            <artifactId>alfresco-maven-plugin</artifactId>
+                            <version>${maven.alfresco.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.codehaus.plexus</groupId>
+                            <artifactId>plexus-archiver</artifactId>
+                            <version>2.3</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>${maven.clean.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${maven.dependency.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven.surefire.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>${maven.install.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven.jar.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>${maven.antrun.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.google.code.maven-replacer-plugin</groupId>
+                    <artifactId>replacer</artifactId>
+                    <version>${maven.replacer.version}</version>
+                </plugin>
+                <!-- Configures tomcat with proper deps and performance fixes -->
+                <plugin>
+                    <groupId>org.apache.tomcat.maven</groupId>
+                    <artifactId>tomcat7-maven-plugin</artifactId>
+                    <version>${maven.tomcat.version}</version>
+                    <configuration>
+                        <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+                    </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.h2database</groupId>
+                            <artifactId>h2</artifactId>
+                            <version>${h2.version}</version>
+                        </dependency>
+                        <!-- Major performance improvement,
+                        see http://mindthegab.com/2013/06/20/maven-is-not-so-evil-plexus-archives-2-3-is-a-life-saver-for-the-speed-of-your-war-development-with-maven/ -->
+                        <dependency>
+                            <groupId>org.codehaus.plexus</groupId>
+                            <artifactId>plexus-archiver</artifactId>
+                            <version>2.3</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+                <!--m2e configuration only to prevent errors in import.
+                    NOTE: This plugin's configuration is used to store Eclipse m2e settings only.
+                          It has no influence on the Maven build itself. -->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.alfresco.maven.plugin</groupId>
+                                        <artifactId>alfresco-maven-plugin</artifactId>
+                                        <versionRange>[0.0,)</versionRange>
+                                        <goals>
+                                            <goal>set-version</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <execute>
+                                            <runOnIncremental>true</runOnIncremental>
+                                            <runOnConfiguration>true</runOnConfiguration>
+                                        </execute>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>${app.filtering.enabled}</filtering>
+            </resource>
+            <resource>
+                <directory>${app.amp.folder}</directory>
+                <targetPath>${app.amp.output.folder}</targetPath>
+                <filtering>${app.filtering.enabled}</filtering>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>${app.filtering.enabled}</filtering>
+            </testResource>
+        </testResources>
+    </build>
+
+    <profiles>
+
+        <!-- ====================================================================================================
+          MANUALLY-ACTIVATED PROFILES
+         ==================================================================================================== -->
+
+
+        <!--
+            Cleans Alfresco data folder (i.e. /alf_data_dev), which contains content store, solr indexes, and H2 database.
+            It will also clean out any .log files.
+            This is different from doing a $mvn clean, which just removes the /target directories for each module.
+            So to wipe everything out and start from scratch you can do: $mvn clean -Ppurge
+            -->
+        <profile>
+            <id>purge</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>${project.basedir}/${alfresco.data.location}</directory>
+                                </fileset>
+                                <fileset>
+                                    <directory>${project.basedir}</directory>
+                                    <includes>
+                                        <include>**/*.log*</include>
+                                    </includes>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!--
+             Enables working with the Alfresco Enterprise version.
+             If you don't specify an enterprise version below, a default version will be used (See alfresco-sdk-aggregator pom),
+             which is usually the latest one, it depends on which SDK version you have.
+             To set a specific Alfresco Enterprise version, manually override the alfresco.version property below .
+
+            NOTE: As you can see below, the repository to be used for Alfresco Enterprise artifacts is
+                  https://artifacts.alfresco.com/nexus/content/groups/private. Please check
+                  with Alfresco Support to get credentials to add to your ~/.m2/settings.xml file
+                  if you are an Enterprise customer or Partner.
+        -->
+        <profile>
+            <id>enterprise</id>
+            <properties>
+                <alfresco.version>${alfresco.enterprise.default.version}</alfresco.version>
+                <alfresco.repo.artifactId>alfresco-enterprise</alfresco.repo.artifactId>
+                <alfresco.share.artifactId>share-enterprise</alfresco.share.artifactId>
+                <!-- Not needed in the webapp for enterprise -->
+                <app.slf4j.scope>provided</app.slf4j.scope>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>alfresco-private-repository</id>
+                    <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+                </repository>
+            </repositories>
+        </profile>
+
+        <!--
+          Clear JS & CSS Dependency Caches for Share, Refresh Repo & Share Web Scripts.
+          You will have to activate this profile manually while you are compiling.
+          For example: $mvn compile -Pclear-caches-refresh-ws
+          -->
+        <profile>
+            <id>clear-caches-refresh-ws</id>
             <dependencies>
+                <dependency>
+                    <groupId>org.codehaus.groovy.modules.http-builder</groupId>
+                    <artifactId>http-builder</artifactId>
+                    <version>0.7.1</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.groovy.maven</groupId>
+                        <artifactId>gmaven-plugin</artifactId>
+                        <version>1.0</version>
+                        <executions>
+                            <execution>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <configuration>
+                                    <source>
+                                        <![CDATA[
+                                        import groovyx.net.http.RESTClient
+                                        import groovyx.net.http.HttpResponseException
+                                        import static groovyx.net.http.ContentType.*
+
+                                        try {
+                                            def alfresco = new RESTClient('http://localhost:8080/alfresco/')
+
+                                            // Refresh Alfresco Repo Web Scripts
+                                            def refreshWebScriptsPath = 's/index'
+                                            alfresco.auth.basic 'admin', 'admin'
+                                            def resp = alfresco.post(path: refreshWebScriptsPath, body: [reset: 'on'], requestContentType: URLENC)
+                                            log.info "\nRequest: Alfresco Repo Refresh Web Scripts. Response status: ${resp.status}"
+
+                                            def share = new RESTClient('http://localhost:8080/share/')
+
+                                            // Clear Alfresco Share Dependency Caches for JS, CSS, Templates
+                                            def clearDependencyCachesPath = 'page/caches/dependency/clear'
+                                            share.auth.basic 'admin', 'admin'
+                                            resp = share.post(path: clearDependencyCachesPath)
+                                            log.info "\nRequest: Alfresco Share Clear Dependency Caches. Response status: ${resp.status}"
+
+                                            // Refresh Share Web Scripts
+                                            refreshWebScriptsPath = 'page/index'
+                                            share.auth.basic 'admin', 'admin'
+                                            resp = share.post(path: refreshWebScriptsPath, body: [reset: 'on'], requestContentType: URLENC)
+                                            log.info "\nRequest: Alfresco Share Refresh Web Scripts. Response status: ${resp.status}"
+                                        } catch (HttpResponseException ex) {
+                                            println "Unexpected response error: ${ex.statusCode}"
+                                        }
+                                        ]]>
+                                    </source>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!--
+          Profile related to the stand-alone AMP extension projects.
+          This profile will enable you to apply a Repo AMP or Share AMP to the Alfresco.WAR or Share.war web application,
+          and then run the customized WAR in an embedded Tomcat instance with the H2 database.
+
+          Note. This is similar to the run profile in the all-in-one archetype, except you don't get:
+            - the Share Webapp and Solr4 Webapp when working with a Repo AMP.
+            - the Repo Webapp and Solr4 Webapp when working with a Share AMP (in this case we assume an Alfresco.war is already running on 8080 in some other Tomcat)
+
+          Note. This profile is not used when you are working with an all-in-one project!
+        -->
+        <profile>
+            <id>amp-to-war</id>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+            <build>
+                <plugins>
+                    <!-- Fetch and unpack Alfresco Repository WAR (alfresco.war) -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unpack-alfresco</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>${alfresco.groupId}</groupId>
+                                            <artifactId>${app.amp.client.war.artifactId}</artifactId>
+                                            <type>war</type>
+                                            <version>${alfresco.version}</version>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- The current AMP artifact is installed into the Alfresco folder using alfresco-maven-plugin -->
+                    <plugin>
+                        <groupId>org.alfresco.maven.plugin</groupId>
+                        <artifactId>alfresco-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>amps-to-war-overlay</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>install</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <!-- We need to selectively not install web resources so to enable rapid dev -->
+                            <includeWebResources>false</includeWebResources>
+                        </configuration>
+                    </plugin>
+                    <!-- Configures tomcat to run against the Alfresco WAR with Tomcat7 virtual webapp features.
+                         (http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Virtual_webapp)
+                         The target/classes and target/test-classes (containing tests and the amp config for test purposes) are prepended to the
+                         running webapp context, so changes from the IDE are automatically picked up first. See context.xml for details.
+                    -->
+                    <plugin>
+                        <groupId>org.apache.tomcat.maven</groupId>
+                        <artifactId>tomcat7-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>run-embedded</id>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <phase>integration-test</phase>
+                                <configuration>
+                                    <useTestClasspath>false</useTestClasspath>
+                                    <ignorePackaging>true</ignorePackaging>
+                                    <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+                                    <systemProperties>
+                                        <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+                                    </systemProperties>
+                                    <delegate>true</delegate>
+                                    <contextFile>${project.basedir}/tomcat/context.xml</contextFile>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.alfresco.maven</groupId>
+                    <artifactId>alfresco-rad</artifactId>
+                    <version>${maven.alfresco.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
+
+        <!-- ====================================================================================================
+              AUTO-ACTIVATED PROFILES
+             ==================================================================================================== -->
+
+
+        <!--
+          Enables AMP specific processing when a module.properties file is found.
+          The following files will be filtered and copied to the test-classpath
+          so they can be picked up by tests and tomcat embedded:
+              module.properties file for the AMP
+              /config directory content for the AMP
+        -->
+        <profile>
+            <id>enable-amp</id>
+            <activation>
+                <file>
+                    <exists>src/main/amp/module.properties</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.alfresco.maven.plugin</groupId>
+                        <artifactId>alfresco-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                    </plugin>
+                    <!-- Copies module properties to the test classpath in the right location,
+                         so that it can be picked up by tests and tomcat embedded -->
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-module-properties-to-test-classpath</id>
+                                <phase>process-test-resources</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${app.amp.folder}</directory>
+                                            <includes>
+                                                <include>module.properties</include>
+                                            </includes>
+                                            <filtering>${app.filtering.enabled}</filtering>
+                                            <targetPath>alfresco/module/${project.artifactId}</targetPath>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>add-module-config-to-test-classpath</id>
+                                <phase>process-test-resources</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${app.amp.folder}/config</directory>
+                                            <includes>
+                                                <include>**/*</include>
+                                            </includes>
+                                            <filtering>${app.filtering.enabled}</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Enables alfresco testing dependencies if a src/test/java folder is found, by adding appropriate dependencies -->
+        <profile>
+            <id>enable-alfresco-testing</id>
+            <activation>
+                <file>
+                    <exists>src/test/java</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven.surefire.version}</version>
+                        <configuration>
+                            <argLine>${app.testing.jvm.args}</argLine>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <!-- Add RAD capabilities for remote JUnit test running. Scope=test so the custom JUnit remote runner
+                     is found in the Maven test classpath -->
+                <dependency>
+                    <groupId>org.alfresco.maven</groupId>
+                    <artifactId>alfresco-rad</artifactId>
+                    <version>${maven.alfresco.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <!--
+          The following 2 profiles adds the /properties directories as resource directories in the project.
+          This means we can filter the property files in these directories.
+          The presence of this /properties directory also activates these profiles.
+          -->
+        <profile>
+            <id>enable-properties-filtering</id>
+            <activation>
+                <file>
+                    <!-- No properties allowed here. Only hardcoded values are properly interpreted -->
+                    <exists>src/main/properties</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>${maven.buildhelper.version}</version>
+                        <executions>
+                            <execution>
+                                <id>add-env-properties</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>add-resource</goal>
+                                </goals>
+                                <configuration>
+                                    <resources>
+                                        <resource>
+                                            <directory>${app.properties.folder}</directory>
+                                            <includes>
+                                                <include>${app.properties.include}</include>
+                                            </includes>
+                                            <filtering>${app.filtering.enabled}</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>enable-test-properties-filtering</id>
+            <activation>
+                <file>
+                    <!-- No properties allowed here. Only hardcoded values are properly interpreted -->
+                    <exists>src/test/properties</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>${maven.buildhelper.version}</version>
+                        <executions>
+                            <execution>
+                                <id>add-env-test-properties</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>add-test-resource</goal>
+                                </goals>
+                                <configuration>
+                                    <resources>
+                                        <resource>
+                                            <directory>${app.properties.test.folder}</directory>
+                                            <includes>
+                                                <include>${app.properties.test.include}</include>
+                                            </includes>
+                                            <filtering>${app.filtering.enabled}</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!--
+          Brings in the H2 Database and JDBC Driver for use in Embedded testing.
+          (activated if a test alfresco-global.properties is found)
+          -->
+        <profile>
+            <id>config-h2-support</id>
+            <activation>
+                <file>
+                    <exists>src/test/properties/local/alfresco-global.properties</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <!-- h2 Dependency -->
                 <dependency>
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
                     <version>${h2.version}</version>
-                </dependency>
-                <!-- Major performance improvement,
-                see http://mindthegab.com/2013/06/20/maven-is-not-so-evil-plexus-archives-2-3-is-a-life-saver-for-the-speed-of-your-war-development-with-maven/ -->
-                <dependency>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-archiver</artifactId>
-                    <version>2.3</version>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
-        </plugin>
-		<!--m2e configuration only to prevent errors in import.
-			NOTE: This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
-        <plugin>
-            <groupId>org.eclipse.m2e</groupId>
-            <artifactId>lifecycle-mapping</artifactId>
-            <version>1.0.0</version>
-            <configuration>
-                <lifecycleMappingMetadata>
-                    <pluginExecutions>
-                        <pluginExecution>
-                            <pluginExecutionFilter>
-                                <groupId>org.alfresco.maven.plugin</groupId>
-                                <artifactId>alfresco-maven-plugin</artifactId>
-                                <versionRange>[0.0,)</versionRange>
-                                <goals>
-                                    <goal>set-version</goal>
-                                </goals>
-                            </pluginExecutionFilter>
-                            <action>
-                                <execute>
-                                    <runOnIncremental>true</runOnIncremental>
-                                    <runOnConfiguration>true</runOnConfiguration>
-                                </execute>
-                            </action>
-                        </pluginExecution>
-                    </pluginExecutions>
-                </lifecycleMappingMetadata>
-            </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+        </profile>
 
-    <resources>
-        <resource>
-            <directory>src/main/resources</directory>
-            <filtering>${app.filtering.enabled}</filtering>
-        </resource>
-		<resource>
-			<directory>${app.amp.folder}</directory>
-			<targetPath>${app.amp.output.folder}</targetPath>
-			<filtering>${app.filtering.enabled}</filtering>
-		</resource>
-    </resources>
-    <testResources>
-        <testResource>
-            <directory>src/test/resources</directory>
-            <filtering>${app.filtering.enabled}</filtering>
-        </testResource>
-    </testResources>
-  </build>
-
-
-  <!-- Feature / behavioral profiles -->
-  <profiles>
-    <!-- Enable environment properties filtering based on the env property -->
-    <profile>
-        <id>enable-properties-filtering</id>
-        <activation>
-            <file>
-                <!-- No properties allowed here. Only hardcoded values are properly interpreted -->
-                <exists>src/main/properties</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>${maven.buildhelper.version}</version>
-                    <executions>
-                        <execution>
-                            <id>add-env-properties</id>
-                            <phase>generate-resources</phase>
-                            <goals>
-                                <goal>add-resource</goal>
-                            </goals>
-                            <configuration>
-                                <resources>
-                                    <resource>
-                                        <directory>${app.properties.folder}</directory>
-                                        <includes>
-                                            <include>${app.properties.include}</include>
-                                        </includes>
-                                        <filtering>${app.filtering.enabled}</filtering>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- Enable environment test properties filtering based on the env property -->
-    <profile>
-        <id>enable-test-properties-filtering</id>
-        <activation>
-            <file>
-                <!-- No properties allowed here. Only hardcoded values are properly interpreted -->
-                <exists>src/test/properties</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>${maven.buildhelper.version}</version>
-                    <executions>
-                        <execution>
-                            <id>add-env-test-properties</id>
-                            <phase>generate-resources</phase>
-                            <goals>
-                                <goal>add-test-resource</goal>
-                            </goals>
-                            <configuration>
-                                <resources>
-                                    <resource>
-                                        <directory>${app.properties.test.folder}</directory>
-                                        <includes>
-                                            <include>${app.properties.test.include}</include>
-                                        </includes>
-                                        <filtering>${app.filtering.enabled}</filtering>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- Enable AMP lifecycle if finds a module.properties, including unit testing support -->
-    <profile>
-      <id>enable-amp</id>
-      <activation>
-        <file>
-          <exists>src/main/amp/module.properties</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.alfresco.maven.plugin</groupId>
-            <artifactId>alfresco-maven-plugin</artifactId>
-            <extensions>true</extensions>
-          </plugin>
-          <!-- Copies module properties to the test classpath in the right location, so that it can be picked up by tests and tomcat embedded -->
-          <plugin>
-              <artifactId>maven-resources-plugin</artifactId>
-              <executions>
-                  <execution>
-                      <id>add-module-properties-to-test-classpath</id>
-                      <phase>process-test-resources</phase>
-                      <goals>
-                          <goal>copy-resources</goal>
-                      </goals>
-                      <configuration>
-                          <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
-                          <resources>
-                              <resource>
-                                  <directory>${app.amp.folder}</directory>
-                                  <includes>
-                                      <include>module.properties</include>
-                                  </includes>
-                                  <filtering>${app.filtering.enabled}</filtering>
-                                  <targetPath>alfresco/module/${project.artifactId}</targetPath>
-                              </resource>
-                          </resources>
-                      </configuration>
-                  </execution>		
-                  <execution>
-                      <id>add-module-config-to-test-classpath</id>
-                      <phase>process-test-resources</phase>
-                      <goals>
-                          <goal>copy-resources</goal>
-                      </goals>
-                      <configuration>
-                          <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
-                          <resources>
-                              <resource>
-                                  <directory>${app.amp.folder}/config</directory>
-                                  <includes>
-                                      <include>**/*</include>
-                                  </includes>
-                                  <filtering>${app.filtering.enabled}</filtering>
-                              </resource>
-                          </resources>
-                      </configuration>
-                  </execution>		  
-              </executions>
-            </plugin>
-        </plugins>        
-      </build>
-      
-    </profile>
-    
-    <!-- Enables alfresco testing dependencies if a src/test/java folder is found, by adding appropriate dependencies -->
-    <profile>
-    	<id>enable-alfresco-testing</id>
-        <activation>
-            <file>
-                <exists>src/test/java</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-surefire-plugin</artifactId>
-                  <version>${maven.surefire.version}</version>
-                  <configuration>
-                      <argLine>${app.testing.jvm.args}</argLine>
-                  </configuration>
-                </plugin>
-            </plugins>
-        </build>
-    	<dependencies>
-        	<dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <scope>test</scope>
-              </dependency>
-              <!-- Add RAD capabilities for remote JUnit test running. Scope=test so the custom JUnit remote runner is found in the Maven test classpath -->
-              <dependency>
-                  <groupId>org.alfresco.maven</groupId>
-                  <artifactId>alfresco-rad</artifactId>
-                  <version>${maven.alfresco.version}</version>
-                  <scope>test</scope>
-              </dependency>
-    	</dependencies>
-    </profile>
-
-    <!-- Profile to enable rapid application development with JRebel. Automatically generates rebel.xml files. 
-    	 NOTE: This experimental feature added in the SDK 1.1.0 is now deprecated as of version 2.x in favor of spring-loaded.
-         Use at your own risk. This profile needs to be called explicitly with -Pjrebel -->
-    <profile>
-      <id>jrebel</id>
-      <build>
-        <plugins>
-            <plugin>
-                <groupId>org.zeroturnaround</groupId>
-                <artifactId>jrebel-maven-plugin</artifactId>
-                <version>1.1.5</version>
-                <executions>
-                  <execution>
-                    <id>generate-rebel-xml</id>
-                    <phase>prepare-package</phase>
-                    <goals>
-                      <goal>generate</goal>
-                    </goals>
-                  </execution>
-                </executions>
-                <configuration>
-                    <packaging>war</packaging>
-                    <generateDefaultElements>false</generateDefaultElements>
-                    <classpath>
-                        <resources>
-                            <resource>
-                                <directory>${project.build.outputDirectory}</directory>
-                            </resource>
-                            <resource>
-                                <directory>${project.build.testOutputDirectory}</directory>
-                            </resource>
-                        </resources>
-                    </classpath>
-                    <web>
-                        <resources>
-                            <resource>
-                                <target>/</target>
-                                <directory>${project.build.directory}/${project.build.finalName}</directory>
-                            </resource>
-                            <resource>
-                                <target>/</target>
-                                <directory>${project.build.directory}/${project.build.finalName}-war</directory>
-                            </resource>
-                        </resources>
-                    </web>
-                </configuration>
-            </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- 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 -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-alfresco</id>
-                <phase>prepare-package</phase>
-                <goals><goal>unpack</goal></goals>
-                <configuration>
-                  <outputDirectory>${alfresco.client.war.folder}</outputDirectory>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>${alfresco.client.war.groupId}</groupId>
-                      <artifactId>${alfresco.client.war}</artifactId>
-                      <type>war</type>
-                      <version>${alfresco.client.war.version}</version>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- The current AMP artifact is installed into the Alfresco folder using alfresco-maven-plugin -->
-          <plugin>
-            <groupId>org.alfresco.maven.plugin</groupId>
-            <artifactId>alfresco-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>amps-to-war-overlay</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>install</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-                <!-- We need to selectively not install web resources so to enable rapid dev -->
-                <includeWebResources>false</includeWebResources>
-            </configuration>
-          </plugin>
-          <!-- Configures tomcat to run against the Alfresco WAR with Tomcat7 virtual webapp features. 
-               (http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Virtual_webapp)	 	
-          	   The target/classes and target/test-classes (containing tests and the amp config for test purposes) are prepended to the 
-          	   running webapp context, so changes from the IDE are automatically picked up first. See context.xml for details. 
+        <!--
+            This profile, which is active by default, enforces some SDK requirements, currently:
+                - min Alfresco version
+                - min Java version
+                - min Maven version
           -->
-          <plugin>
-            <groupId>org.apache.tomcat.maven</groupId>
-            <artifactId>tomcat7-maven-plugin</artifactId>
-            <executions>
-                <execution>
-                    <id>run-embedded</id>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                    <phase>integration-test</phase>
-                    <configuration>
-                          <useTestClasspath>false</useTestClasspath>
-                          <ignorePackaging>true</ignorePackaging>
-                          <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-                          <systemProperties>
-                            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-                          </systemProperties>
-                          <delegate>true</delegate>
-                          <contextFile>${project.basedir}/tomcat/context.xml</contextFile>
-                    </configuration>
-                </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
+        <profile>
+            <id>enforce-sdk-rules</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <version>${maven.enforcer.plugin}</version>
+                        <executions>
+                            <execution>
+                                <id>enforce-sdk-requirements</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <!-- Test for Alfresco version -->
+                                        <requireProperty>
+                                            <property>alfresco.version</property>
+                                            <message>The SDK 2.x is supported only for Alfresco 5.x Community and
+                                                Enterprise versions
+                                            </message>
+                                            <regex>^5\..*</regex>
+                                        </requireProperty>
 
-		<dependency>
-			<groupId>org.alfresco.maven</groupId>
-			<artifactId>alfresco-rad</artifactId>
-			<version>${maven.alfresco.version}</version>
-		</dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>${maven.jetty.version}</version>
-        </dependency>
+                                        <!-- Test for JDK version -->
+                                        <requireJavaVersion>
+                                            <version>[1.7.0,)</version>
+                                            <message>Alfresco 5+ requires Java 7</message>
+                                        </requireJavaVersion>
 
-      </dependencies>
-    </profile>
+                                        <!-- Test for Maven version -->
+                                        <requireMavenVersion>
+                                            <version>3.2.2</version>
+                                        </requireMavenVersion>
+                                    </rules>
+                                    <fail>true</fail>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-    <!-- Cleans Alfresco data folder, embedded DB and any log file found -->
-    <profile>
-        <id>purge</id>
-        <build>
-            <plugins>
-                  <!-- Cleaning Alfresco Repository storage/log folders/files -->
-                  <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <configuration>
-                      <filesets>
-                        <fileset>
-                          <directory>${project.basedir}/${alfresco.data.location}</directory>
-                        </fileset>
-                        <fileset>
-                          <directory>${project.basedir}/solr_home</directory>
-                        </fileset>
-                        <fileset>
-                          <directory>${project.basedir}</directory>
-                          <includes>
-                            <include>**/*.log</include>
-                          </includes>
-                        </fileset>
-                      </filesets>
-                    </configuration>
-                  </plugin>
-            </plugins>
-        </build>
-    </profile>
-    <!-- Enforce SDK rules for clearer fast fail error messaging and safer usage  -->
-    <profile>
-        <id>enforce-sdk-rules</id>
-        <activation>
-            <activeByDefault>true</activeByDefault>
-        </activation>
-        <build>
-            <plugins>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>${maven.enforcer.plugin}</version>
-                <executions>
-                  <execution>
-                    <id>enforce-sdk-requirements</id>
-                    <goals>
-                      <goal>enforce</goal>
-                    </goals>
-                    <configuration>
-                      <rules>
-                         <!-- Test for Alfresco version -->
-                         <requireProperty>
-                            <property>alfresco.version</property>
-                            <message>The SDK 2.x is supported only for Alfresco 5.x Community and Enterprise versions</message>
-                            <regex>^5\..*</regex>
-                         </requireProperty>
-                         <!-- Test for JDK version -->
-                         <requireJavaVersion>
-                            <version>[1.7.0,)</version>
-                            <message>Alfresco 5+ requires Java 7</message>
-                         </requireJavaVersion>
-                         <requireMavenVersion>
-                            <version>3.2.2</version>
-                         </requireMavenVersion>
-                      </rules>
-                      <fail>true</fail>
-                    </configuration>
-                  </execution>
-                </executions>
-              </plugin>
-            </plugins>
-        </build>
-    </profile>
-    <!-- Does any SDK dev environment preparation (e.g. spring-loaded download)  -->
-    <profile>
-        <id>setup</id>
-        <activation>
-            <activeByDefault>false</activeByDefault>
-        </activation>
-       <build>
-             <!-- This simply downloads the spring-loaded jar to ~/.m2/repository/org/springframework/spring-loaded/${springloaded.version}/spring-loaded-${springloaded.version}.jar -->
-            <plugins>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                  <execution>
-                    <id>get-spring-loaded</id>
-                    <phase>validate</phase>
-                    <goals><goal>get</goal></goals>
-                    <configuration>
-                      <artifact>org.springframework:springloaded:${springloaded.version}</artifact>
-                    </configuration>
-                  </execution>
-                </executions>
-              </plugin>
-            </plugins>
-       </build>
-    </profile>
-    
-    <!--
-    	 Enables working with Alfresco Enterprise latest version. You can then manually override the alfresco.version in your pom.xml 
-    -->
-    <profile>
-        <id>enterprise</id>
-        <properties>
-            <alfresco.version>${alfresco.enterprise.default.version}</alfresco.version>
-            <alfresco.repo.artifactId>alfresco-enterprise</alfresco.repo.artifactId>
-            <alfresco.share.artifactId>share-enterprise</alfresco.share.artifactId>
-            <!-- Not needed in the webapp for enterprise -->
-			<app.slf4j.scope>provided</app.slf4j.scope>                        
-        </properties>
-        <repositories>
-            <repository>
-                <id>alfresco-private-repository</id>
-                <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
-            </repository>
-        </repositories>
-    </profile>
-    <!-- EXPERIMENTAL: Invokes the Alfresco Technical Validation tool at https://github.com/AlfrescoLabs/technical-validation -->
-    <profile>
-        <id>atv</id>
-        <properties>
-            <maven.alfresco.validation.skip>false</maven.alfresco.validation.skip>
-            <maven.alfresco.validation.sourceLocation>${project.build.directory}/${project.build.finalName}-src</maven.alfresco.validation.sourceLocation>
-        </properties>
-        <build>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>isolate-project-src</id>
-                            <phase>generate-resources</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${maven.alfresco.validation.sourceLocation}</outputDirectory>
+
+        <!-- ====================================================================================================
+              ONE OFF/SETUP operations
+             ==================================================================================================== -->
+
+
+        <!--
+          Does any SDK dev environment preparation and setup, currently does the following:
+              - Downloads Spring Loaded java agent, which is used from the Maven repo location via the run.sh script
+          -->
+        <profile>
+            <id>setup</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <!-- This simply downloads the spring-loaded jar to
+                    ~/.m2/repository/org/springframework/spring-loaded/${springloaded.version}/spring-loaded-${springloaded.version}.jar -->
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>get-spring-loaded</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>get</goal>
+                                </goals>
+                                <configuration>
+                                    <artifact>org.springframework:springloaded:${springloaded.version}</artifact>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+
+        <!-- ====================================================================================================
+              EXPERIMENTAL
+             ==================================================================================================== -->
+
+
+        <!--
+          Invokes the Alfresco Technical Validation tool at
+          https://github.com/AlfrescoLabs/technical-validation
+          -->
+        <profile>
+            <id>atv</id>
+            <properties>
+                <maven.alfresco.validation.skip>false</maven.alfresco.validation.skip>
+                <maven.alfresco.validation.sourceLocation>${project.build.directory}/${project.build.finalName}-src
+                </maven.alfresco.validation.sourceLocation>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>isolate-project-src</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${maven.alfresco.validation.sourceLocation}</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.basedir}</directory>
+                                            <excludes>
+                                                <exclude>target</exclude>
+                                            </excludes>
+                                            <filtering>${app.filtering.enabled}</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.alfresco.maven.plugin</groupId>
+                        <artifactId>alfresco-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>run-atv</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>validate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>de.herschke</groupId>
+                        <artifactId>neo4j-maven-plugin</artifactId>
+                        <version>2.0.2-20140827</version>
+                        <executions>
+                            <execution>
+                                <id>start-neo4j-server</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>start-server</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop-neo4j-server</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>stop-server</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <port>7474</port>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+
+        <!-- ====================================================================================================
+              !!! DEPRECATED !!!
+             ==================================================================================================== -->
+
+
+        <!--
+              Profile to enable rapid application development with JRebel. Automatically generates rebel.xml files.
+
+              NOTE: This experimental feature was added in the SDK 1.1.0 but is now deprecated as of version 2.x
+              in favor of spring-loaded.
+        -->
+        <profile>
+            <id>jrebel</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.zeroturnaround</groupId>
+                        <artifactId>jrebel-maven-plugin</artifactId>
+                        <version>1.1.5</version>
+                        <executions>
+                            <execution>
+                                <id>generate-rebel-xml</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <packaging>war</packaging>
+                            <generateDefaultElements>false</generateDefaultElements>
+                            <classpath>
                                 <resources>
                                     <resource>
-                                        <directory>${project.basedir}</directory>
-                                        <excludes>
-                                            <exclude>target</exclude>
-                                        </excludes>
-                                        <filtering>${app.filtering.enabled}</filtering>
+                                        <directory>${project.build.outputDirectory}</directory>
+                                    </resource>
+                                    <resource>
+                                        <directory>${project.build.testOutputDirectory}</directory>
                                     </resource>
                                 </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.alfresco.maven.plugin</groupId>
-                    <artifactId>alfresco-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>run-atv</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>validate</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>de.herschke</groupId>
-                    <artifactId>neo4j-maven-plugin</artifactId>
-                    <version>2.0.2-20140827</version>
-                    <executions>
-                        <execution>
-                            <id>start-neo4j-server</id>
-                            <phase>post-integration-test</phase>
-                            <goals>
-                                <goal>start-server</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>stop-neo4j-server</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>stop-server</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <port>7474</port>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-    <!-- Configures automatic embedded H2 database support for repository amps (if a test alfresco-global.properties is found) -->
-    <profile>
-        <id>config-h2-support</id>
-        <activation>
-            <file>
-                <exists>src/test/properties/local/alfresco-global.properties</exists>
-            </file>
-        </activation>
-        <dependencies>
-              <!-- h2 Dependency -->
-              <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2.version}</version>
-                <scope>test</scope>
-              </dependency>
-        </dependencies>
-    </profile>
-  </profiles>
+                            </classpath>
+                            <web>
+                                <resources>
+                                    <resource>
+                                        <target>/</target>
+                                        <directory>${project.build.directory}/${project.build.finalName}</directory>
+                                    </resource>
+                                    <resource>
+                                        <target>/</target>
+                                        <directory>${project.build.directory}/${project.build.finalName}-war</directory>
+                                    </resource>
+                                </resources>
+                            </web>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+
+    </profiles>
 </project>