[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.0-beta-5

Support for custom webapps and sysprops, #412,#413
Merge branch 'sdk-3.0' of https://github.com/Alfresco/alfresco-sdk into sdk-3.0
2025-09-10 14:12:12 +00:00 · 2016-10-05 09:51:19 +01:00 · 2016-10-03 12:05:39 +01:00 · 2016-09-30 12:10:54 +01:00 · 2016-09-30 12:10:35 +01:00 · 2016-09-23 10:02:48 +01:00
121 changed files with 4322 additions and 1835 deletions
--- a/README.md
+++ b/README.md
@@ -7,8 +7,9 @@ This project is released under the [Apache License, Version 2.0](http://www.apac

 ## News

- 2015-10-19: SDK 2.1.1 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html), [Release notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest/github-report.html)
- 2015-05-20: SDK 2.1.0 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html), [Release notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest/github-report.html)
+- 2016-02-20: SDK 2.2.0 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html), [Release notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest/github-report.html)
+- 2015-10-19: SDK 2.1.1 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html) 
+- 2015-05-20: SDK 2.1.0 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html)
 - 2014-12-23: SDK 2.0.0 release to Maven Central. [Docs](http://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html), [Release Notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/archive/2.0.0/github-report.htm)  
 - 2014-08-22: First SNAPSHOT of SDK 2.0.0 in the [OSS Sonatype Repository](https://oss.sonatype.org/content/repositories/snapshots/org/alfresco/maven/alfresco-sdk-parent/2.0.0-SNAPSHOT/)!
 - 2014-07: Project fully migrated from [Google Code](https://code.google.com/p/maven-alfresco-archetypes).
@@ -16,20 +17,23 @@ This project is released under the [Apache License, Version 2.0](http://www.apac
 ## User Getting Started

 ### Latest Documentation
-To get started with Alfresco SDK 2.1.1 (latest) visit the offical Alfresco Documentation for:
+To get started with Alfresco SDK 2.2.0 (latest) visit the offical Alfresco Documentation for:

- [Alfresco Community 5.0.d and above](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html)
- [Alfresco Enterprise 5.0.1 and above](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html)
+- [Alfresco Community 5.1 and above](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html)
+- [Alfresco Enterprise 5.1 and above](http://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html)

 #### Previous versions Documentation
- Documentation for [Alfresco SDK 2.0](http://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html) (compatible with Alfresco 5.0.d Community and 5.0.0 Enterprise)
+- Documentation for [Alfresco SDK 2.1](http://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html) (compatible with Alfresco 5.0.d Community and 5.0.1 Enterprise)
+- Documentation for [Alfresco SDK 2.0](http://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html) (compatible with Alfresco 5.0.c Community and 5.0.0 Enterprise)
 - Documentation for [Alfresco SDK 1.1.1](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html) (compatible with Alfresco 4.2)

 ### Samples 
-Sample extension projects that use the SDK, maintained by @ohej in the [Alfresco SDK Samples project](https://github.com/Alfresco/alfresco-sdk-samples/).
+Sample extension projects that use the SDK:
+ - [Alfresco SDK Samples for 5.1 (JARs)](https://github.com/Alfresco/alfresco-sdk-samples/tree/alfresco-51/all-in-one).
+ - [Alfresco SDK Samples for 5.0 (AMPs)](https://github.com/Alfresco/alfresco-sdk-samples/tree/alfresco-50/all-in-one).

 ### Command reference
-A list of supported features and commands, explanation of Maven profiles and commands is kept in the [Alfresco Official Docs](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-cmd-reference.html).
+A list of supported features and commands is kept in the [Alfresco Official Docs](http://docs.alfresco.com/5.1/concepts/alfresco-sdk-cmd-reference.html).

 ### Want to get up to speed quickly in Eclipse? Check out this video!

--- a/archetypes/activiti-jar-archetype/pom.xml
+++ b/archetypes/activiti-jar-archetype/pom.xml
@@ -0,0 +1,62 @@
+<?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>
+
+  <groupId>org.alfresco.maven.archetype</groupId>
+  <artifactId>activiti-jar-archetype</artifactId>
+
+  <packaging>maven-archetype</packaging>
+  <name>Alfresco SDK - Activiti JAR Archetype</name>
+  <description>Sample project with full support for lifecycle and rapid development of Activiti JARs</description>
+
+  <parent>
+    <groupId>org.alfresco.maven</groupId>
+    <artifactId>alfresco-sdk-aggregator</artifactId>
+    <version>3.0.0-beta-5</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>archetype-resources/run.bat</include>
+                <include>archetype-resources/debug.sh</include>
+                <include>archetype-resources/debug.bat</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>archetype-resources/run.bat</exclude>
+                <exclude>archetype-resources/debug.sh</exclude>
+                <exclude>archetype-resources/debug.bat</exclude>
+                <exclude>META-INF/maven/archetype-metadata.xml</exclude>
+            </excludes>
+            <filtering>false</filtering>
+        </resource>
+      </resources>
+
+      <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>${maven.resource.version}</version>
+            <configuration>
+                <useDefaultDelimiters>false</useDefaultDelimiters>
+                <delimiters>
+                    <delimiter>@@</delimiter>
+                </delimiters>
+            </configuration>
+        </plugin>
+      </plugins>
+  </build>
+
+</project>
--- a/archetypes/activiti-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/activiti-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
+        name="Activiti JAR Archetype"
+        xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <requiredProperties>
+        <requiredProperty key="version">
+            <defaultValue>1.0-SNAPSHOT</defaultValue>
+        </requiredProperty>
+    </requiredProperties>
+
+    <fileSets>
+        <fileSet filtered="true" packaged="true" encoding="UTF-8">
+            <directory>src/main/java</directory>
+            <includes>
+                <include>**/*.java</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="true" packaged="true" encoding="UTF-8">
+            <directory>src/test/java</directory>
+            <includes>
+                <include>**/*.java</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="true">
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>**/bpmn-models/**</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/main/resources</directory>
+            <excludes>
+                <exclude>**/bpmn-models/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="true">
+            <directory>src/test/resources</directory>
+            <includes>
+                <include>log4j-dev.properties</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/test/resources</directory>
+            <excludes>
+                <exclude>log4j-dev.properties</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/test/license</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8">
+            <directory></directory>
+            <includes>
+                <include>debug.sh</include>
+                <include>debug.bat</include>
+                <include>run.sh</include>
+                <include>run.bat</include>
+                <include>README.md</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</archetype-descriptor>
+R
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/README.md
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/README.md
@@ -0,0 +1,21 @@
+# Alfresco Activiti JAR Module - SDK 3
+
+To run use `mvn clean install alfresco:run` or `./run.sh` and verify that it 
+
+ * Runs the embedded Tomcat + H2 DB 
+ * Runs Activiti Explorer
+ * Optionally runs Activiti REST
+ * Packages both a JAR with customization
+  
+# Few things to notice
+
+ * No parent pom
+ * WAR assembly is handled by the Alfresco Maven Plugin configuration
+ * Standard JAR packaging and layout
+ * Works seamlessly with Eclipse and IntelliJ IDEA
+ * JRebel for hot reloading, JRebel maven plugin for generating rebel.xml, agent usage: `MAVEN_OPTS=-Xms256m -Xmx1G -agentpath:/home/martin/apps/jrebel/lib/libjrebel64.so`
+ * [Configurable Run mojo](https://github.com/Alfresco/alfresco-sdk/blob/sdk-3.0/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java) in the `alfresco-maven-plugin`
+ * No unit testing/functional tests just yet
+    
+  
+ 
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.bat
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.bat
@@ -0,0 +1,9 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::      Dev environment startup script for Alfresco Community     ::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+@echo off
+
+set MAVEN_OPTS=-Xms1G -Xmx2G
+
+mvnDebug clean install alfresco:run
+
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.sh
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/debug.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+MAVEN_OPTS="-Xms1G -Xmx2G" mvnDebug clean install alfresco:run
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/pom.xml
@@ -0,0 +1,295 @@
+<?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>
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <version>${version}</version>
+    <name>${artifactId} Activiti Jar Module - SDK 3</name>
+    <description>Activiti JAR Module that produces a JAR file with Java extensions such as service task delegates. It also produces an application ZIP with workflow definition, forms etc that can be deployed via /activiti-app - SDK 3</description>
+    <packaging>jar</packaging>
+
+    <properties>
+        <!-- Alfresco Maven Plugin version to use -->
+        <alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version>
+
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <!-- Base directory for all RDBMS data and Content data -->
+        <activiti.datadir>${project.basedir}/activiti_data_dev</activiti.datadir>
+
+        <!-- Properties used in dependency declarations, you don't usually need to change these -->
+        <activiti.groupId>com.activiti</activiti.groupId>
+        <activiti.app.war.artifactId>activiti-app</activiti.app.war.artifactId> <!--This contains the Alfresco Activiti webapp, including the workflow engine. This webapp is also the user interface for people involved in the task and processes running in the Activiti engine. You also use this webapp to create and manage process definitions, and to display and define analytics reports on users' tasks and processes. -->
+        <activiti.admin.war.artifactId>activiti-admin</activiti.admin.war.artifactId> <!-- This contains the Alfresco Activiti Administrator webapp. You use this to administer and monitor your Alfresco Activiti engines.-->
+
+        <!-- The version of the Alfresco Activiti Enterprise Workflow Engine that the customization will run in -->
+        <activiti.version>1.5.1</activiti.version>
+
+        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
+        <jrebel.version>1.1.6</jrebel.version>
+
+        <!-- Compile with Java 7, default is 5 -->
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <!-- The main Activiti Enterprise application dependency that brings in all
+             needed classes to compile your customizations -->
+        <dependency>
+            <groupId>${activiti.groupId}</groupId>
+            <artifactId>activiti-app-logic</artifactId>
+            <version>${activiti.version}</version>
+            <exclusions>
+                <!-- Exclude the SLF4J JAR so we don't get multiple binding warnings when running -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Testing -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Logging, maybe needed for testing....
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.5</version>
+        </dependency>
+        -->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Create the BAR with project process definitions, forms etc -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <id>create-app-zip</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <zip destfile="${project.build.directory}/${project.artifactId}-app-${project.version}.zip">
+                                    <fileset dir="src/main/resources/apps/helloworld">
+                                        <include name="**"/>
+                                    </fileset>
+                                </zip>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--
+                The Alfresco Maven Plugin contains all the logic to run the extension
+                in an embedded Tomcat with the H2 database.
+                -->
+            <plugin>
+                <groupId>org.alfresco.maven.plugin</groupId>
+                <artifactId>alfresco-maven-plugin</artifactId>
+                <version>${alfresco.sdk.version}</version>
+                <configuration>
+                    <!-- We need the flat file H2 database to run Activiti -->
+                    <enableH2>true</enableH2>
+
+                    <!-- Bring in the Activiti Workflow Engine and Management webapp (i.e. activiti-app.war) -->
+                    <enableActivitiApp>true</enableActivitiApp>
+
+                    <!-- Optionally bring in the Activiti Admin App (i.e. activiti-admin.war) -->
+                    <enableActivitiAdmin>false</enableActivitiAdmin>
+
+                    <!-- Disable all Alfresco ECM apps by default -->
+                    <alfrescoEdition>community</alfrescoEdition>
+                    <enablePlatform>false</enablePlatform>
+                    <enableSolr>false</enableSolr>
+                    <enableShare>false</enableShare>
+
+                    <!--
+                       JARs that should be overlayed/applied to the Activiti App WAR
+                       (i.e. activiti-app.war)
+                       -->
+                    <activitiModules>
+                        <!-- Bring in this JAR project, need to be included here, otherwise resources from META-INF
+                             will not be loaded, such as the test.html page
+                        -->
+                        <moduleDependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <version>${project.version}</version>
+                        </moduleDependency>
+                    </activitiModules>
+                </configuration>
+            </plugin>
+
+            <!-- Hot reloading with JRebel -->
+            <plugin>
+                <groupId>org.zeroturnaround</groupId>
+                <artifactId>jrebel-maven-plugin</artifactId>
+                <version>${jrebel.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-rebel-xml</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- For more information about how to configure JRebel plugin see:
+                         http://manuals.zeroturnaround.com/jrebel/standalone/maven.html#maven-rebel-xml -->
+                    <classpath>
+                        <fallback>all</fallback>
+                        <resources>
+                            <resource>
+                                <!--
+                                Empty resource element marks default configuration. By
+                                default it is placed first in generated configuration.
+                                -->
+                            </resource>
+                        </resources>
+                    </classpath>
+
+                    <!--
+                      alwaysGenerate - default is false
+                      If 'false' - rebel.xml is generated if timestamps of pom.xml and the current rebel.xml file are not equal.
+                      If 'true' - rebel.xml will always be generated
+                    -->
+                    <alwaysGenerate>true</alwaysGenerate>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <nonFilteredFileExtensions> <!-- jpg, jpeg, gif, bmp and png are added automatically -->
+                        <nonFilteredFileExtension>ftl</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>acp</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>
+                        <nonFilteredFileExtension>css</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ico</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>psd</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>js</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <resources>
+            <!-- Filter the resource files in this project and do property substitutions -->
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <!-- The Project JAR Should not contain any process definition stuff,
+                     it cannot be deployed via JAR in Activiti Enterprise -->
+                <excludes>
+                    <exclude>apps/**</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <testResources>
+            <!-- Filter the test resource files in this project and do property substitutions -->
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+            <!-- Copy over the Activiti license to the classpath -->
+            <testResource>
+                <directory>src/test/license</directory>
+                <filtering>false</filtering>
+            </testResource>
+        </testResources>
+    </build>
+
+    <!--
+        Alfresco Maven Repositories
+        -->
+    <repositories>
+        <!-- Alfresco ECM -->
+        <repository>
+            <id>alfresco-public</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+        </repository>
+        <repository>
+            <id>alfresco-public-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+        </repository>
+        <!-- Alfresco Enterprise Edition Artifacts, put username/pwd for server in settings.xml -->
+        <repository>
+            <id>alfresco-private-repository</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+        </repository>
+
+        <!-- Activiti BPM -->
+        <repository>
+            <id>activiti-public</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases/</url>
+        </repository>
+        <repository>
+            <id>activiti-public-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+        </repository>
+        <!-- Activiti Enterprise Edition Artifacts, put username/pwd for server in settings.xml -->
+        <repository>
+            <id>activiti-private-repository</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <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>
+
+</project>
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.bat
@@ -0,0 +1,8 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::      Dev environment startup script for Alfresco Community     ::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+@echo off
+
+set MAVEN_OPTS=-Xms1G -Xmx2G
+
+mvn clean install alfresco:run
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.sh
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+MAVEN_OPTS="-Xms1G -Xmx2G" mvn clean install alfresco:run
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/java/tasks/service/HelloWorldServiceTask.java
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/java/tasks/service/HelloWorldServiceTask.java
@@ -0,0 +1,38 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+package ${package}.tasks.service;
+
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.JavaDelegate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A sample service task Java implementation
+ *
+ * @author martin.bergljung@alfresco.com
+ */
+public class HelloWorldServiceTask implements JavaDelegate {
+    private static Logger logger = LoggerFactory.getLogger(HelloWorldServiceTask.class);
+
+    public void execute(DelegateExecution execution) throws Exception {
+        logger.debug("Hello World from the Java Service Task!");
+    }
+}
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/Hello
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/Hello
@@ -0,0 +1,20 @@
+{
+  "models": [
+    {
+      "id": 2005,
+      "name": "Hello World",
+      "version": 1,
+      "modelType": 0,
+      "description": "The Hello World business process that is part of the Alfresco SDK 3.0 Activiti JAR Module Maven archetype",
+      "stencilSetId": 0,
+      "createdByFullName": " Administrator",
+      "createdBy": 1,
+      "lastUpdatedByFullName": " Administrator",
+      "lastUpdatedBy": 1,
+      "lastUpdated": "2016-09-29T12:38:13.716+0000"
+    }
+  ],
+  "theme": "theme-1",
+  "icon": "glyphicon-cog",
+  "publishIdentityInfo": []
+}
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello
@@ -0,0 +1,141 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn"
+             xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+             xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
+             typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"
+             targetNamespace="http://www.activiti.org/processdef" xmlns:modeler="http://activiti.com/modeler"
+             modeler:version="1.0en" modeler:exportDateTime="20160930093425488" modeler:modelId="2005"
+             modeler:modelVersion="11" modeler:modelLastUpdated="1475224420676">
+    <process id="HelloWorld" name="Hello World" isExecutable="true">
+        <documentation>The Hello World business process that is part of the Alfresco SDK 3.0 Activiti JAR Module Maven
+            archetype
+        </documentation>
+
+        <startEvent id="startHelloWorld" activiti:formKey="2006">
+            <extensionElements>
+                <modeler:form-reference-id><![CDATA[2006]]></modeler:form-reference-id>
+                <modeler:form-reference-name><![CDATA[Hello World Start]]></modeler:form-reference-name>
+                <modeler:editor-resource-id><![CDATA[startEvent1]]></modeler:editor-resource-id>
+            </extensionElements>
+        </startEvent>
+
+        <sequenceFlow id="sid-4A014247-BF0C-436D-B3CE-EA297F2A18FA" sourceRef="startHelloWorld"
+                      targetRef="decideGreeting">
+            <extensionElements>
+                <modeler:editor-resource-id>
+                    <![CDATA[sid-4A014247-BF0C-436D-B3CE-EA297F2A18FA]]></modeler:editor-resource-id>
+            </extensionElements>
+        </sequenceFlow>
+
+        <serviceTask id="decideGreeting" name="Decide greeting"
+                     activiti:delegateExpression="${activiti_executeDecisionDelegate}">
+            <extensionElements>
+                <activiti:field name="decisionTableReferenceKey">
+                    <activiti:string><![CDATA[DecideWhatGreeting]]></activiti:string>
+                </activiti:field>
+                <modeler:decisiontable-reference modeler:decisiontablereferenceid="2007"
+                                                 modeler:decisiontablereferencename="Decide What Greeting"/>
+                <modeler:editor-resource-id>
+                    <![CDATA[sid-B4E2D526-60B7-47B9-856C-FC824DA15708]]></modeler:editor-resource-id>
+            </extensionElements>
+        </serviceTask>
+
+        <sequenceFlow id="sid-E8B736FE-874D-4EDF-85A6-8B602F1503FD" sourceRef="decideGreeting"
+                      targetRef="printGreetingFromJava">
+            <extensionElements>
+                <modeler:editor-resource-id>
+                    <![CDATA[sid-E8B736FE-874D-4EDF-85A6-8B602F1503FD]]></modeler:editor-resource-id>
+            </extensionElements>
+        </sequenceFlow>
+
+        <serviceTask id="printGreetingFromJava" name="Print Greeting From Java"
+                     activiti:class="${package}.tasks.service.HelloWorldServiceTask">
+            <extensionElements>
+                <modeler:editor-resource-id>
+                    <![CDATA[sid-61E86F19-FC5F-4814-B9AB-2394B03171D6]]></modeler:editor-resource-id>
+            </extensionElements>
+        </serviceTask>
+
+        <sequenceFlow id="sid-AD10A830-F8B1-4DBA-9C48-DFD5136E3810" sourceRef="printGreetingFromJava"
+                      targetRef="sid-68AE120D-AB55-4ED2-AFD5-845139236AD3">
+            <extensionElements>
+                <modeler:editor-resource-id>
+                    <![CDATA[sid-AD10A830-F8B1-4DBA-9C48-DFD5136E3810]]></modeler:editor-resource-id>
+            </extensionElements>
+        </sequenceFlow>
+
+        <scriptTask id="sid-68AE120D-AB55-4ED2-AFD5-845139236AD3" name="Print Greeting from JS"
+                    scriptFormat="JavaScript" activiti:autoStoreVariables="false">
+            <extensionElements>
+                <modeler:editor-resource-id>
+                    <![CDATA[sid-68AE120D-AB55-4ED2-AFD5-845139236AD3]]></modeler:editor-resource-id>
+            </extensionElements>
+            <script><![CDATA[print("Hello World from JavaScript task:");
+var userId = initiator;
+print(dayGreeting + " " + userInfoBean.getUser(userId).getFullName());
+print("You entered '" + greeting + "' as a greeting text.");
+]]></script>
+        </scriptTask>
+
+        <sequenceFlow id="sid-6105A21B-6A76-41EC-B88E-78B3BE4A826F" sourceRef="sid-68AE120D-AB55-4ED2-AFD5-845139236AD3"
+                      targetRef="endHelloWorld">
+            <extensionElements>
+                <modeler:editor-resource-id>
+                    <![CDATA[sid-6105A21B-6A76-41EC-B88E-78B3BE4A826F]]></modeler:editor-resource-id>
+            </extensionElements>
+        </sequenceFlow>
+
+        <endEvent id="endHelloWorld">
+            <extensionElements>
+                <modeler:editor-resource-id>
+                    <![CDATA[sid-9F0B5A13-7D1F-4ADF-8A08-7B9F0D851DA6]]></modeler:editor-resource-id>
+            </extensionElements>
+            <terminateEventDefinition/>
+        </endEvent>
+    </process>
+
+    <bpmndi:BPMNDiagram id="BPMNDiagram_HelloWorld">
+        <bpmndi:BPMNPlane bpmnElement="HelloWorld" id="BPMNPlane_HelloWorld">
+            <bpmndi:BPMNShape bpmnElement="startHelloWorld" id="BPMNShape_startHelloWorld">
+                <omgdc:Bounds height="30.0" width="30.0" x="90.0" y="190.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="decideGreeting" id="BPMNShape_decideGreeting">
+                <omgdc:Bounds height="80.0" width="100.0" x="210.0" y="165.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-68AE120D-AB55-4ED2-AFD5-845139236AD3"
+                              id="BPMNShape_sid-68AE120D-AB55-4ED2-AFD5-845139236AD3">
+                <omgdc:Bounds height="80.0" width="100.0" x="675.0" y="165.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="endHelloWorld" id="BPMNShape_endHelloWorld">
+                <omgdc:Bounds height="28.0" width="28.0" x="915.0" y="191.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="printGreetingFromJava" id="BPMNShape_printGreetingFromJava">
+                <omgdc:Bounds height="80.0" width="100.0" x="443.0" y="165.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNEdge bpmnElement="sid-AD10A830-F8B1-4DBA-9C48-DFD5136E3810"
+                             id="BPMNEdge_sid-AD10A830-F8B1-4DBA-9C48-DFD5136E3810">
+                <omgdi:waypoint x="543.0" y="205.0"/>
+                <omgdi:waypoint x="675.0" y="205.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-4A014247-BF0C-436D-B3CE-EA297F2A18FA"
+                             id="BPMNEdge_sid-4A014247-BF0C-436D-B3CE-EA297F2A18FA">
+                <omgdi:waypoint x="120.0" y="205.0"/>
+                <omgdi:waypoint x="210.0" y="205.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-E8B736FE-874D-4EDF-85A6-8B602F1503FD"
+                             id="BPMNEdge_sid-E8B736FE-874D-4EDF-85A6-8B602F1503FD">
+                <omgdi:waypoint x="310.0" y="205.0"/>
+                <omgdi:waypoint x="443.0" y="205.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-6105A21B-6A76-41EC-B88E-78B3BE4A826F"
+                             id="BPMNEdge_sid-6105A21B-6A76-41EC-B88E-78B3BE4A826F">
+                <omgdi:waypoint x="775.0" y="205.0"/>
+                <omgdi:waypoint x="915.0" y="205.0"/>
+            </bpmndi:BPMNEdge>
+        </bpmndi:BPMNPlane>
+    </bpmndi:BPMNDiagram>
+</definitions>
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello
@@ -0,0 +1,403 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+{
+  "resourceId": 2005,
+  "properties": {
+    "process_id": "HelloWorld",
+    "name": "Hello World",
+    "documentation": "The Hello World business process that is part of the Alfresco SDK 3.0 Activiti JAR Module Maven archetype",
+    "process_author": "",
+    "process_version": "",
+    "process_namespace": "http://www.activiti.org/processdef",
+    "executionlisteners": "",
+    "eventlisteners": "",
+    "signaldefinitions": "",
+    "messagedefinitions": "",
+    "executionvariables": "",
+    "metadata": ""
+  },
+  "stencil": {
+    "id": "BPMNDiagram"
+  },
+  "childShapes": [
+    {
+      "resourceId": "startEvent1",
+      "properties": {
+        "overrideid": "startHelloWorld",
+        "name": "",
+        "documentation": "",
+        "executionlisteners": "",
+        "initiator": "",
+        "formkeydefinition": "",
+        "formreference": {
+          "id": 2006,
+          "name": "Hello World Start",
+          "referenceId": 2005,
+          "variablesmapping": []
+        },
+        "fieldstovariables": "",
+        "formproperties": ""
+      },
+      "stencil": {
+        "id": "StartNoneEvent"
+      },
+      "childShapes": [],
+      "outgoing": [
+        {
+          "resourceId": "sid-4A014247-BF0C-436D-B3CE-EA297F2A18FA"
+        }
+      ],
+      "bounds": {
+        "lowerRight": {
+          "x": 120,
+          "y": 220
+        },
+        "upperLeft": {
+          "x": 90,
+          "y": 190
+        }
+      },
+      "dockers": []
+    },
+    {
+      "resourceId": "sid-B4E2D526-60B7-47B9-856C-FC824DA15708",
+      "properties": {
+        "overrideid": "decideGreeting",
+        "name": "Decide greeting",
+        "documentation": "",
+        "asynchronousdefinition": "false",
+        "exclusivedefinition": "false",
+        "executionlisteners": "",
+        "multiinstance_type": "None",
+        "multiinstance_cardinality": "",
+        "multiinstance_collection": "",
+        "multiinstance_variable": "",
+        "multiinstance_condition": "",
+        "isforcompensation": "false",
+        "decisiontaskdecisiontablereference": {
+          "id": 2007,
+          "name": "Decide What Greeting",
+          "referenceId": 2005,
+          "variablesmapping": []
+        }
+      },
+      "stencil": {
+        "id": "DecisionTask"
+      },
+      "childShapes": [],
+      "outgoing": [
+        {
+          "resourceId": "sid-E8B736FE-874D-4EDF-85A6-8B602F1503FD"
+        }
+      ],
+      "bounds": {
+        "lowerRight": {
+          "x": 310,
+          "y": 245
+        },
+        "upperLeft": {
+          "x": 210,
+          "y": 165
+        }
+      },
+      "dockers": []
+    },
+    {
+      "resourceId": "sid-4A014247-BF0C-436D-B3CE-EA297F2A18FA",
+      "properties": {
+        "overrideid": "",
+        "name": "",
+        "documentation": "",
+        "conditionsequenceflow": "",
+        "executionlisteners": "",
+        "defaultflow": "false"
+      },
+      "stencil": {
+        "id": "SequenceFlow"
+      },
+      "childShapes": [],
+      "outgoing": [
+        {
+          "resourceId": "sid-B4E2D526-60B7-47B9-856C-FC824DA15708"
+        }
+      ],
+      "bounds": {
+        "lowerRight": {
+          "x": 209.3515625,
+          "y": 205
+        },
+        "upperLeft": {
+          "x": 120.53125,
+          "y": 205
+        }
+      },
+      "dockers": [
+        {
+          "x": 15,
+          "y": 15
+        },
+        {
+          "x": 50,
+          "y": 40
+        }
+      ],
+      "target": {
+        "resourceId": "sid-B4E2D526-60B7-47B9-856C-FC824DA15708"
+      }
+    },
+    {
+      "resourceId": "sid-68AE120D-AB55-4ED2-AFD5-845139236AD3",
+      "properties": {
+        "scriptformat": "JavaScript",
+        "scripttext": "print(\"Hello World from JavaScript task:\");\nvar userId = initiator;\nprint(dayGreeting + \" \" + userInfoBean.getUser(userId).getFullName());\nprint(\"You entered '\" + greeting + \"' as a greeting text.\");\n",
+        "executionvariables": "",
+        "overrideid": "",
+        "name": "Print Greeting from JS",
+        "documentation": "",
+        "asynchronousdefinition": "false",
+        "exclusivedefinition": "false",
+        "executionlisteners": "",
+        "multiinstance_type": "None",
+        "multiinstance_cardinality": "",
+        "multiinstance_collection": "",
+        "multiinstance_variable": "",
+        "multiinstance_condition": "",
+        "isforcompensation": "false"
+      },
+      "stencil": {
+        "id": "ScriptTask"
+      },
+      "childShapes": [],
+      "outgoing": [
+        {
+          "resourceId": "sid-6105A21B-6A76-41EC-B88E-78B3BE4A826F"
+        }
+      ],
+      "bounds": {
+        "lowerRight": {
+          "x": 775,
+          "y": 245
+        },
+        "upperLeft": {
+          "x": 675,
+          "y": 165
+        }
+      },
+      "dockers": []
+    },
+    {
+      "resourceId": "sid-9F0B5A13-7D1F-4ADF-8A08-7B9F0D851DA6",
+      "properties": {
+        "overrideid": "endHelloWorld",
+        "name": "",
+        "documentation": "",
+        "executionlisteners": ""
+      },
+      "stencil": {
+        "id": "EndTerminateEvent"
+      },
+      "childShapes": [],
+      "outgoing": [],
+      "bounds": {
+        "lowerRight": {
+          "x": 943,
+          "y": 219
+        },
+        "upperLeft": {
+          "x": 915,
+          "y": 191
+        }
+      },
+      "dockers": []
+    },
+    {
+      "resourceId": "sid-6105A21B-6A76-41EC-B88E-78B3BE4A826F",
+      "properties": {
+        "overrideid": "",
+        "name": "",
+        "documentation": "",
+        "conditionsequenceflow": "",
+        "executionlisteners": "",
+        "defaultflow": "false"
+      },
+      "stencil": {
+        "id": "SequenceFlow"
+      },
+      "childShapes": [],
+      "outgoing": [
+        {
+          "resourceId": "sid-9F0B5A13-7D1F-4ADF-8A08-7B9F0D851DA6"
+        }
+      ],
+      "bounds": {
+        "lowerRight": {
+          "x": 914.453125,
+          "y": 205
+        },
+        "upperLeft": {
+          "x": 775.40625,
+          "y": 205
+        }
+      },
+      "dockers": [
+        {
+          "x": 50,
+          "y": 40
+        },
+        {
+          "x": 14,
+          "y": 14
+        }
+      ],
+      "target": {
+        "resourceId": "sid-9F0B5A13-7D1F-4ADF-8A08-7B9F0D851DA6"
+      }
+    },
+    {
+      "resourceId": "sid-61E86F19-FC5F-4814-B9AB-2394B03171D6",
+      "properties": {
+        "overrideid": "printGreetingFromJava",
+        "name": "Print Greeting From Java",
+        "documentation": "",
+        "asynchronousdefinition": "false",
+        "exclusivedefinition": "false",
+        "executionlisteners": "",
+        "multiinstance_type": "None",
+        "multiinstance_cardinality": "",
+        "multiinstance_collection": "",
+        "multiinstance_variable": "",
+        "multiinstance_condition": "",
+        "isforcompensation": "false",
+        "servicetaskclass": "${package}.tasks.service.HelloWorldServiceTask",
+        "servicetaskexpression": "",
+        "servicetaskdelegateexpression": "",
+        "servicetaskfields": "",
+        "servicetaskresultvariable": "",
+        "executionvariables": ""
+      },
+      "stencil": {
+        "id": "ServiceTask"
+      },
+      "childShapes": [],
+      "outgoing": [
+        {
+          "resourceId": "sid-AD10A830-F8B1-4DBA-9C48-DFD5136E3810"
+        }
+      ],
+      "bounds": {
+        "lowerRight": {
+          "x": 543,
+          "y": 245
+        },
+        "upperLeft": {
+          "x": 443,
+          "y": 165
+        }
+      },
+      "dockers": []
+    },
+    {
+      "resourceId": "sid-AD10A830-F8B1-4DBA-9C48-DFD5136E3810",
+      "properties": {
+        "overrideid": "",
+        "name": "",
+        "documentation": "",
+        "conditionsequenceflow": "",
+        "executionlisteners": "",
+        "defaultflow": "false"
+      },
+      "stencil": {
+        "id": "SequenceFlow"
+      },
+      "childShapes": [],
+      "outgoing": [
+        {
+          "resourceId": "sid-68AE120D-AB55-4ED2-AFD5-845139236AD3"
+        }
+      ],
+      "bounds": {
+        "lowerRight": {
+          "x": 674.15625,
+          "y": 205
+        },
+        "upperLeft": {
+          "x": 543.84375,
+          "y": 205
+        }
+      },
+      "dockers": [
+        {
+          "x": 50,
+          "y": 40
+        },
+        {
+          "x": 50,
+          "y": 40
+        }
+      ],
+      "target": {
+        "resourceId": "sid-68AE120D-AB55-4ED2-AFD5-845139236AD3"
+      }
+    },
+    {
+      "resourceId": "sid-E8B736FE-874D-4EDF-85A6-8B602F1503FD",
+      "properties": {
+        "overrideid": "",
+        "name": "",
+        "documentation": "",
+        "conditionsequenceflow": "",
+        "executionlisteners": "",
+        "defaultflow": "false",
+        "showdiamondmarker": false
+      },
+      "stencil": {
+        "id": "SequenceFlow"
+      },
+      "childShapes": [],
+      "outgoing": [
+        {
+          "resourceId": "sid-61E86F19-FC5F-4814-B9AB-2394B03171D6"
+        }
+      ],
+      "bounds": {
+        "lowerRight": {
+          "x": 443,
+          "y": 205
+        },
+        "upperLeft": {
+          "x": 310.59375,
+          "y": 205
+        }
+      },
+      "dockers": [
+        {
+          "x": 50,
+          "y": 40
+        },
+        {
+          "x": 1,
+          "y": 40
+        }
+      ],
+      "target": {
+        "resourceId": "sid-61E86F19-FC5F-4814-B9AB-2394B03171D6"
+      }
+    }
+  ],
+  "bounds": {
+    "lowerRight": {
+      "x": 1200,
+      "y": 1050
+    },
+    "upperLeft": {
+      "x": 0,
+      "y": 0
+    }
+  },
+  "stencilset": {
+    "url": "stencilsets/bpmn2.0/bpmn2.0.json",
+    "namespace": "http://b3mn.org/stencilset/bpmn2.0#"
+  },
+  "ssextensions": []
+}
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide
@@ -0,0 +1,53 @@
+{
+  "referenceId": 2005,
+  "name": "Decide What Greeting",
+  "description": "Decide, depending on time of day, what greeting to display.",
+  "editorJson": {
+    "id": 2007,
+    "name": "Decide What Greeting",
+    "key": "DecideWhatGreeting",
+    "description": "Decide, depending on time of day, what greeting to display.",
+    "hitIndicator": "FIRST",
+    "inputExpressions": [
+      {
+        "id": "3",
+        "variableId": "timeofday",
+        "variableType": "formfield",
+        "type": "string",
+        "label": "Time of day",
+        "entries": null,
+        "newVariable": false
+      }
+    ],
+    "outputExpressions": [
+      {
+        "id": "4",
+        "variableId": "dayGreeting",
+        "variableType": "variable",
+        "type": "string",
+        "label": "DayGreeting",
+        "entries": null,
+        "newVariable": true
+      }
+    ],
+    "rules": [
+      {
+        "3": "== \"time_of_day_morning\"",
+        "4": "\"Good Morning!\""
+      },
+      {
+        "3": "== \"time_of_day_lunch\"",
+        "4": "\"Good Day!\""
+      },
+      {
+        "3": "== \"time_of_day_dinner\"",
+        "4": "\"Good Evening!\""
+      },
+      {
+        "3": "== \"time_of_day_night\"",
+        "4": "\"Good Night!\""
+      }
+    ],
+    "executionVariables": []
+  }
+}
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello
@@ -0,0 +1,201 @@
+{
+  "referenceId": 2005,
+  "name": "Hello World Start",
+  "description": "The form for the Start task in the Hello World business process.",
+  "editorJson": {
+    "tabs": [],
+    "fields": [
+      {
+        "fieldType": "ContainerRepresentation",
+        "id": "1475149613209",
+        "name": "Label",
+        "type": "container",
+        "value": null,
+        "required": false,
+        "readOnly": false,
+        "overrideId": false,
+        "colspan": 1,
+        "placeholder": null,
+        "minLength": 0,
+        "maxLength": 0,
+        "minValue": null,
+        "maxValue": null,
+        "regexPattern": null,
+        "optionType": null,
+        "hasEmptyValue": null,
+        "options": null,
+        "restUrl": null,
+        "restResponsePath": null,
+        "restIdProperty": null,
+        "restLabelProperty": null,
+        "tab": null,
+        "className": null,
+        "dateDisplayFormat": null,
+        "layout": null,
+        "sizeX": 2,
+        "sizeY": 1,
+        "row": -1,
+        "col": -1,
+        "visibilityCondition": null,
+        "numberOfColumns": 2,
+        "fields": {
+          "1": [
+            {
+              "fieldType": "FormFieldRepresentation",
+              "id": "greeting",
+              "name": "Greeting",
+              "type": "text",
+              "value": null,
+              "required": true,
+              "readOnly": false,
+              "overrideId": false,
+              "colspan": 1,
+              "placeholder": null,
+              "minLength": 0,
+              "maxLength": 0,
+              "minValue": null,
+              "maxValue": null,
+              "regexPattern": null,
+              "optionType": null,
+              "hasEmptyValue": null,
+              "options": null,
+              "restUrl": null,
+              "restResponsePath": null,
+              "restIdProperty": null,
+              "restLabelProperty": null,
+              "tab": null,
+              "className": null,
+              "params": {
+                "existingColspan": 1,
+                "maxColspan": 2
+              },
+              "dateDisplayFormat": null,
+              "layout": {
+                "row": -1,
+                "column": -1,
+                "colspan": 1
+              },
+              "sizeX": 1,
+              "sizeY": 1,
+              "row": -1,
+              "col": -1,
+              "visibilityCondition": null
+            }
+          ],
+          "2": []
+        }
+      },
+      {
+        "fieldType": "ContainerRepresentation",
+        "id": "1475149862241",
+        "name": "Label",
+        "type": "container",
+        "value": null,
+        "required": false,
+        "readOnly": false,
+        "overrideId": false,
+        "colspan": 1,
+        "placeholder": null,
+        "minLength": 0,
+        "maxLength": 0,
+        "minValue": null,
+        "maxValue": null,
+        "regexPattern": null,
+        "optionType": null,
+        "hasEmptyValue": null,
+        "options": null,
+        "restUrl": null,
+        "restResponsePath": null,
+        "restIdProperty": null,
+        "restLabelProperty": null,
+        "tab": null,
+        "className": null,
+        "dateDisplayFormat": null,
+        "layout": null,
+        "sizeX": 2,
+        "sizeY": 1,
+        "row": -1,
+        "col": -1,
+        "visibilityCondition": null,
+        "numberOfColumns": 2,
+        "fields": {
+          "1": [
+            {
+              "fieldType": "RestFieldRepresentation",
+              "id": "timeofday",
+              "name": "Time of Day",
+              "type": "dropdown",
+              "value": "Choose one...",
+              "required": false,
+              "readOnly": false,
+              "overrideId": false,
+              "colspan": 1,
+              "placeholder": null,
+              "minLength": 0,
+              "maxLength": 0,
+              "minValue": null,
+              "maxValue": null,
+              "regexPattern": null,
+              "optionType": null,
+              "hasEmptyValue": true,
+              "options": [
+                {
+                  "id": "empty",
+                  "name": "Choose one..."
+                },
+                {
+                  "id": "time_of_day_morning",
+                  "name": "Morning"
+                },
+                {
+                  "id": "time_of_day_lunch",
+                  "name": "Lunch"
+                },
+                {
+                  "id": "time_of_day_dinner",
+                  "name": "Dinner"
+                },
+                {
+                  "id": "time_of_day_night",
+                  "name": "Night"
+                }
+              ],
+              "restUrl": null,
+              "restResponsePath": null,
+              "restIdProperty": null,
+              "restLabelProperty": null,
+              "tab": null,
+              "className": null,
+              "params": {
+                "existingColspan": 1,
+                "maxColspan": 2
+              },
+              "dateDisplayFormat": null,
+              "layout": {
+                "row": -1,
+                "column": -1,
+                "colspan": 1
+              },
+              "sizeX": 1,
+              "sizeY": 1,
+              "row": -1,
+              "col": -1,
+              "visibilityCondition": null,
+              "endpoint": null,
+              "requestHeaders": null
+            }
+          ],
+          "2": []
+        }
+      }
+    ],
+    "outcomes": [],
+    "javascriptEvents": [],
+    "className": "",
+    "style": "",
+    "customFieldTemplates": {},
+    "metadata": {},
+    "variables": [],
+    "gridsterForm": false
+  }
+}
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/license/README.md
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/license/README.md
@@ -0,0 +1,9 @@
+# Enterprise License location
+
+Put the Activiti Enterprise license file (activiti.lic) in this directory.
+It will then be copied into the WAR..............
+
+And then not be part of any other classpaths.
+   
+  
+ 
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-app.properties
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-app.properties
@@ -0,0 +1,35 @@
+server.onpremise=true
+server.stencil.custom.allowed=true
+server.contextroot=/activiti-app
+
+# Database connection
+datasource.driver=org.h2.Driver
+datasource.url=jdbc:h2:${activiti.datadir}/h2/activiti;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0
+datasource.username=alfresco
+datasource.password=alfresco
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+
+# Elastic Search server config for historical process data
+elastic-search.server.type=none
+elastic-search.cluster.name=activiti-elastic-search-cluster-dev
+elastic-search.enable.http=true
+elastic-search.data.path=${activiti.datadir}/es
+
+event.generation.enabled=true
+event.processing.enabled=true
+
+# Administrator login username = email
+admin.email=admin@app.activiti.com
+# koala
+admin.passwordHash=4efe081594ce25ee4efd9f7067f7f678a347bccf2de201f3adf2a3eb544850b465b4e51cdc3fcdde
+admin.lastname=Administrator
+admin.group=Superusers
+
+# Where to store any uploaded files
+contentstorage.fs.rootFolder=${activiti.datadir}/contentstore
+contentstorage.fs.createRoot=true
+contentstorage.fs.depth=4
+contentstorage.fs.blockSize=1024
+
+# Disable Cross-Site-Request-Forgery (CSRF) protection, so we can access from other client app via REST
+security.csrf.disabled=true
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-ldap.properties
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/activiti-ldap.properties
@@ -0,0 +1,3 @@
+ldap.authentication.enabled=false
+ldap.synchronization.full.enabled=false
+ldap.synchronization.differential.enabled=false
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-dev.properties
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-dev.properties
@@ -0,0 +1,40 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+
+# This file is copied (with RunMojo) into target/activitiApp-war/WEB-INF/classes dir before webapp deployment
+#
+
+log4j.rootLogger=INFO, CA, File
+
+# ConsoleAppender
+log4j.appender.CA=org.apache.log4j.ConsoleAppender
+log4j.appender.CA.layout=org.apache.log4j.PatternLayout
+log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %m%n
+
+# File Appender
+log4j.appender.File=org.apache.log4j.RollingFileAppender
+log4j.appender.File.File=${project.build.directory}/activiti.log
+log4j.appender.File.threshold=INFO
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{ISO8601} %-5p [%c] %m%n
+log4j.appender.File.MaxFileSize=100MB
+log4j.appender.File.MaxBackupIndex=1
+
+# Custom tweaks
+log4j.logger.org.apache.ibatis.level=INFO
+log4j.logger.javax.activation.level=INFO
+log4j.logger.com.codahale.metrics=WARN
+log4j.logger.com.ryantenney=WARN
+log4j.logger.com.zaxxer=WARN
+log4j.logger.org.apache=WARN
+log4j.logger.org.hibernate=WARN
+log4j.logger.org.hibernate.engine.internal=WARN
+log4j.logger.org.hibernate.validator=WARN
+log4j.logger.org.springframework=WARN
+log4j.logger.org.springframework.web=WARN
+log4j.logger.org.springframework.security=WARN
+
+
+# Custom classes logging
+log4j.logger.${package}.tasks.service=DEBUG
--- a/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-test.properties
+++ b/archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/test/resources/log4j-test.properties
@@ -0,0 +1,6 @@
+log4j.rootLogger=WARN, CA
+
+# ConsoleAppender
+log4j.appender.CA=org.apache.log4j.ConsoleAppender
+log4j.appender.CA.layout=org.apache.log4j.PatternLayout
+log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %m%n
--- a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties
@@ -1,4 +1,5 @@
 version=0.1-SNAPSHOT
 groupId=archetype.it
-artifactId=repoAmpTestRunEnterprise
+artifactId=activitiJARTest
 package=it.pkg
+
--- a/archetypes/activiti-jar-archetype/src/test/resources/projects/basic/goal.txt
+++ b/archetypes/activiti-jar-archetype/src/test/resources/projects/basic/goal.txt
@@ -0,0 +1 @@
+verify
--- a/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic/archetype.properties
+++ b/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic/archetype.properties
@@ -0,0 +1,4 @@
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=activitiJARTestRun
+package=it.pkg
--- a/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic/goal.txt
+++ b/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic/goal.txt
@@ -0,0 +1 @@
+verify alfresco:run -Dmaven.tomcat.fork=true
--- a/archetypes/alfresco-allinone-archetype/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/pom.xml
@@ -5,13 +5,13 @@
  <groupId>org.alfresco.maven.archetype</groupId>
  <artifactId>alfresco-allinone-archetype</artifactId>
  <packaging>maven-archetype</packaging>
-  <name>Maven Alfresco SDK - All-in-One Archetype</name>
-  <description>Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository WAR overlay, Repository AMP, Share WAR overlay, Solr configuration, and embedded Tomcat runner</description>
+  <name>Alfresco SDK - All-in-One Archetype</name>
+  <description>Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for Platform/Repository JAR and Share JAR</description>
  
  <parent>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.0-beta-2</version>
+    <version>3.0.0-beta-5</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>
  
@@ -23,7 +23,8 @@
                <include>archetype-resources/pom.xml</include>
                <include>archetype-resources/run.sh</include>
                <include>archetype-resources/run.bat</include>
-                <include>archetype-resources/runner/src/main/webapp/index.html</include>
+                <include>archetype-resources/debug.sh</include>
+                <include>archetype-resources/debug.bat</include>
                <include>META-INF/maven/archetype-metadata.xml</include>
            </includes>
            <filtering>true</filtering>
@@ -34,7 +35,8 @@
                <exclude>archetype-resources/pom.xml</exclude>
                <exclude>archetype-resources/run.sh</exclude>
                <exclude>archetype-resources/run.bat</exclude>
-                <exclude>archetype-resources/runner/src/main/webapp/index.html</exclude>
+                <exclude>archetype-resources/debug.sh</exclude>
+                <exclude>archetype-resources/debug.bat</exclude>
                <exclude>META-INF/maven/archetype-metadata.xml</exclude>
            </excludes>
            <filtering>false</filtering>
@@ -43,8 +45,9 @@

     <plugins>
        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-resources-plugin</artifactId>
-            <version>2.7</version>
+            <version>${maven.resource.version}</version>
            <configuration>
                <useDefaultDelimiters>false</useDefaultDelimiters>
                <delimiters>
--- 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
@@ -17,7 +17,7 @@
                <fileSet filtered="false" packaged="false" encoding="UTF-8">
                    <directory>src/main/assembly</directory>
                    <includes>
-                        <include>**/*.xml</include>
+                        <include>**</include>
                    </includes>
                </fileSet>
                <fileSet filtered="true" packaged="true" encoding="UTF-8">
@@ -39,26 +39,12 @@
                    </includes>
                    <excludes>
                        <exclude>**/*-context.xml</exclude>
-                        <exclude>**/log4j.properties</exclude>
                    </excludes>
                </fileSet>
                <fileSet encoding="UTF-8" filtered="true" packaged="false">
                    <directory>src/main/resources</directory>
                    <includes>
                        <include>**/*-context.xml</include>
-                        <include>**/log4j.properties</include>
-                    </includes>
-                </fileSet>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/test/resources</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/test/properties</directory>
-                    <includes>
-                        <include>**/*.properties</include>
                    </includes>
                </fileSet>
            </fileSets>
@@ -66,8 +52,14 @@

        <module id="${rootArtifactId}-share-jar"
                name="${rootArtifactId}-share-jar"
-                dir="__rootArtifactId__-share-jar" >
+                dir="__rootArtifactId__-share-jar">
            <fileSets>
+                <fileSet filtered="false" packaged="false" encoding="UTF-8">
+                    <directory>src/main/assembly</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
                <fileSet filtered="true" packaged="true" encoding="UTF-8">
                    <directory>src/main/java</directory>
                    <includes>
@@ -102,27 +94,43 @@
                        <exclude>**/__artifactId__-example-widgets.xml</exclude>
                    </excludes>
                </fileSet>
-                <fileSet filtered="true" packaged="false" encoding="UTF-8">
-                    <directory>src/test/resources</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
            </fileSets>
        </module>
    </modules>

    <fileSets>
-        <fileSet encoding="UTF-8">
-            <directory>src</directory>
+        <fileSet encoding="UTF-8" filtered="true">
+            <directory>src/test/resources</directory>
+            <includes>
+                <include>**/dev-log4j.properties</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/test/resources</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <excludes>
+                <exclude>**/dev-log4j.properties</exclude>
+            </excludes>
+        </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>src/test/license</directory>
            <includes>
                <include>**</include>
            </includes>
        </fileSet>
-
        <fileSet encoding="UTF-8">
            <directory></directory>
            <includes>
+                <include>debug.sh</include>
+                <include>debug.bat</include>
                <include>run.sh</include>
                <include>run.bat</include>
                <include>README.md</include>
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/assembly/amp.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/assembly/amp.xml
@@ -12,12 +12,39 @@
    <includeBaseDirectory>false</includeBaseDirectory>

    <files>
+        <!-- Filter module.properties and put at top level in the AMP -->
        <file>
            <source>src/main/resources/alfresco/module/${project.artifactId}/module.properties</source>
            <filtered>true</filtered>
        </file>
+        <!-- Include AMP -> WAR mapping file (needed for custom mappings) -->
+        <file>
+            <source>src/main/assembly/file-mapping.properties</source>
+            <filtered>false</filtered>
+        </file>
    </files>

+    <fileSets>
+        <!-- Anything in the assembly/lib directory will end up in the /lib directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/lib</directory>
+            <outputDirectory>lib</outputDirectory>
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Anything in the assembly/web directory will end up in the /web directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/web</directory>
+            <outputDirectory>web</outputDirectory>
+            <filtered>true</filtered> <!-- Will filter files and substitute POM props such as for example ${project.name} -->
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+    <!-- Include the project artifact (JAR) in the /lib directory in the AMP -->
    <dependencySets>
        <dependencySet>
            <outputDirectory>lib</outputDirectory>
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/assembly/file-mapping.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/assembly/file-mapping.properties
@@ -0,0 +1,27 @@
+# Custom AMP to WAR location mappings
+
+#
+# The following property can be used to include the standard set of mappings.
+# The contents of this file will override any defaults.  The default is
+# 'true', i.e. the default mappings will be augmented or modified by values in
+# this file.
+#
+# Default mappings are:
+#
+# /config=/WEB-INF/classes
+# /lib=/WEB-INF/lib
+# /licenses=/WEB-INF/licenses
+# /web/jsp=/jsp
+# /web/css=/css
+# /web/images=/images
+# /web/scripts=/scripts
+# /web/php=/php
+#
+include.default=true
+
+#
+# Custom mappings.  If 'include.default' is false, then this is the complete set.
+# Map /web to / in AMP so we can override things like favicon.ico
+#
+/web=/
+
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/assembly/lib/README.md
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/assembly/lib/README.md
@@ -0,0 +1,21 @@
+# 3rd party libraries (JARs) that should be included in WAR
+
+Put here any 3rd party libraries (JARs) that are needed by customizations, 
+but that are not part of the out-of-the-box libraries in the *alfresco/WEB-INF/lib* 
+directory. 
+
+**Note**. Module dependency needs to be set to amp for the libs to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-platform-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+  
+**Important**. If you need to use a library that is available out-of-the-box, then
+               include it as a *provided* dependency in the module.
+  
+ 
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/assembly/web/README.md
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/assembly/web/README.md
@@ -0,0 +1,22 @@
+# Web resources that should override out-of-the-box files
+
+Put here any web resources that should override out-of-the-box
+web resources, such as favicon.ico. They will then end up in the 
+*/web* directory in the AMP, and applied to the WAR, and override
+any existing web resources in the Alfresco.WAR.
+
+**Note**. Module dependency needs to be set to amp for the web resources to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-platform-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+   
+**Important**. New web resources should not be located here, but instead 
+               in the usual place in the *src/main/resources/META-INF/resources* directory.
+  
+ 
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/java/platformsample/DemoComponent.java
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/java/platformsample/DemoComponent.java
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
 * @author Maurizio Pillitu
 */
 public class DemoComponent extends AbstractModuleComponent {
-    Log log = LogFactory.getLog(DemoComponent.class);
+    private static Log logger = LogFactory.getLog(DemoComponent.class);

    private NodeService nodeService;

@@ -55,8 +55,8 @@ public class DemoComponent extends AbstractModuleComponent {
    @Override
    protected void executeInternal() throws Throwable {
        System.out.println("DemoComponent has been executed");
-        log.debug("Test debug logging. Congratulation your JAR Module is working");
-        log.info("This is only for information purposed. Better remove me from the log in Production");
+        logger.debug("Test debug logging. Congratulation your JAR Module is working");
+        logger.info("This is only for information purposed. Better remove me from the log in Production");
    }

    /**
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/java/platformsample/HelloWorldWebScript.java
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/java/platformsample/HelloWorldWebScript.java
@@ -23,6 +23,8 @@ import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;

 import java.util.HashMap;
 import java.util.Map;
@@ -34,10 +36,15 @@ import java.util.Map;
 * @since 2.1.0
 */
 public class HelloWorldWebScript extends DeclarativeWebScript {
+    private static Log logger = LogFactory.getLog(HelloWorldWebScript.class);
+
    protected Map<String, Object> executeImpl(
            WebScriptRequest req, Status status, Cache cache) {
        Map<String, Object> model = new HashMap<String, Object>();
        model.put("fromJava", "HelloFromJava");
+
+        logger.debug("Your 'Hello World' Web Script was called!");
+
        return model;
    }
 }
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/resources/alfresco/module/artifactId/context/bootstrap-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/resources/alfresco/module/artifactId/context/bootstrap-context.xml
@@ -18,6 +18,12 @@
                <value>alfresco/module/${project.artifactId}/model/workflow-model.xml</value>
            </list>
        </property>
+        <property name="labels">
+            <list>
+                <!-- Bootstrap Resource Bundles for the content model types, aspects, properties etc -->
+                <value>alfresco/module/${project.artifactId}/messages/content-model</value>
+            </list>
+        </property>
    </bean>

    <bean id="${package}.sampleprocess.workflowBootstrap" parent="workflowDeployer">
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/resources/alfresco/module/artifactId/context/service-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/resources/alfresco/module/artifactId/context/service-context.xml
@@ -25,15 +25,15 @@
    <bean id="${package}.exampleBean" class="${package}.platformsample.Demo" init-method="init" />

    <!-- A simple module component that will be executed once.
-         Note. this module component will only be executed once, and then there will be an entry for it in the Repo.
-         So doing for example $ mvn clean install -Prun twice will only execute this component the first time.
+         Note. this module component will only be executed once, and then there will be an entry for it in the Repo DB.
+         So doing for example $ mvn clean install alfresco:run twice will only execute this component the first time.
         You need to remove /alf_data_dev for it to be executed again. -->
    <bean id="${package}.exampleComponent" class="${package}.platformsample.DemoComponent" parent="module.baseComponent" >
        <property name="moduleId" value="${artifactId}" />  <!-- See module.properties -->
        <property name="name" value="exampleComponent" />
        <property name="description" value="A demonstration component" />
        <property name="sinceVersion" value="1.0" />
-        <property name="appliesFromVersion" value="1.0" />
+        <property name="appliesFromVersion" value="0.99" /> <!-- 1.0 would not work here when using SNAPSHOT version in project  -->
        <property name="nodeService" ref="NodeService" />
        <property name="nodeLocatorService" ref="nodeLocatorService" />
    </bean>
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/resources/alfresco/module/artifactId/log4j.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/resources/alfresco/module/artifactId/log4j.properties
@@ -1,43 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#-----------------------------------------------------------------------
-# ${artifactId} module log4j.properties
-#
-#   NOTE
-#   ----
-#      Log4j uses the following logging levels:
-#      debug,info,warn,error,fatal
-#
-#      To set the logging level of {fullClassName} to {loglevel},
-#      add a line to this file of the following form:
-#   
-#               log4j.logger.{fullClassName}={loglevel}
-#
-#      For example, to make 'com.example.MyExample' produce 'debug'
-#      logs, add a line like this:
-#   
-#               log4j.logger.com.example.MyExample=debug
-#
-#
-#   WARNING
-#   -------
-#       Log properties in this log4j.properties file override/augment
-#       those in the webapp's main log4j.properties.
-#    
-#-----------------------------------------------------------------------
-log4j.logger.${package}.platformsample.DemoComponent=debug
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/resources/alfresco/module/artifactId/messages/content-model.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-platform-jar/src/main/resources/alfresco/module/artifactId/messages/content-model.properties
@@ -0,0 +1,6 @@
+# This file should contain content model labels
+
+acme_contentModel.type.acme_document.title=ACME Document
+acme_contentModel.aspect.acme_securityClassified.title=ACME Security Classified
+acme_contentModel.property.acme_documentId.title=Document Id
+acme_contentModel.property.acme_securityClassification.title=Security Classification
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/pom.xml
@@ -30,7 +30,15 @@
            <groupId>org.alfresco.surf</groupId>
            <artifactId>spring-surf-api</artifactId>
        </dependency>
-
    </dependencies>

+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/assembly/amp.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/assembly/amp.xml
@@ -10,13 +10,41 @@
    </formats>

    <includeBaseDirectory>false</includeBaseDirectory>
+
    <files>
+        <!-- Filter module.properties and put at top level in the AMP -->
        <file>
-            <source>${project.basedir}/src/main/resources/alfresco/module/${project.artifactId}/module.properties</source>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/module.properties</source>
            <filtered>true</filtered>
        </file>
+        <!-- Include AMP -> WAR mapping file (needed for custom mappings) -->
+        <file>
+            <source>src/main/assembly/file-mapping.properties</source>
+            <filtered>false</filtered>
+        </file>
    </files>

+    <fileSets>
+        <!-- Anything in the assembly/lib directory will end up in the /lib directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/lib</directory>
+            <outputDirectory>lib</outputDirectory>
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Anything in the assembly/web directory will end up in the /web directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/web</directory>
+            <outputDirectory>web</outputDirectory>
+            <filtered>true</filtered> <!-- Will filter files and substitute POM props such as for example ${project.name} -->
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+    <!-- Include the project artifact (JAR) in the /lib directory in the AMP -->
    <dependencySets>
        <dependencySet>
            <outputDirectory>lib</outputDirectory>
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/assembly/file-mapping.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/assembly/file-mapping.properties
@@ -0,0 +1,27 @@
+# Custom AMP to WAR location mappings
+
+#
+# The following property can be used to include the standard set of mappings.
+# The contents of this file will override any defaults.  The default is
+# 'true', i.e. the default mappings will be augmented or modified by values in
+# this file.
+#
+# Default mappings are:
+#
+# /config=/WEB-INF/classes
+# /lib=/WEB-INF/lib
+# /licenses=/WEB-INF/licenses
+# /web/jsp=/jsp
+# /web/css=/css
+# /web/images=/images
+# /web/scripts=/scripts
+# /web/php=/php
+#
+include.default=true
+
+#
+# Custom mappings.  If 'include.default' is false, then this is the complete set.
+# Map /web to / in AMP so we can override things like favicon.ico
+#
+/web=/
+
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/assembly/lib/README.md
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/assembly/lib/README.md
@@ -0,0 +1,19 @@
+# 3rd party libraries (JARs) that should be included in WAR
+
+Put here any 3rd party libraries (JARs) that are needed by customizations, 
+but that are not part of the out-of-the-box libraries in the *share/WEB-INF/lib* 
+directory. 
+
+**Note**. Module dependency needs to be set to amp for the libs to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-share-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+  
+**Important**. If you need to use a library that is available out-of-the-box, then
+               include it as a *provided* dependency in the module.
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/assembly/web/README.md
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/assembly/web/README.md
@@ -0,0 +1,22 @@
+# Web resources that should override out-of-the-box files
+
+Put here any web resources that should override out-of-the-box
+web resources, such as favicon.ico. They will then end up in the 
+*/web* directory in the AMP, and applied to the WAR, and override
+any existing web resources in the Share.WAR.
+
+**Note**. Module dependency needs to be set to amp for the web resources to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-share-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+   
+**Important**. New web resources should not be located here, but instead 
+               in the usual place in the *src/main/resources/META-INF/resources/<module-id>/* directory.
+  
+ 
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/resources/META-INF/share-config-custom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/resources/META-INF/share-config-custom.xml
@@ -0,0 +1,420 @@
+<!-- Share configuration related to this particular Share module extension, such as:
+     - Doclib action config
+     - Form config
+     - Aspect and Type config
+     - Advanced Search
+
+    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 file:
+             alfresco/tomcat/shared/classes/alfresco/web-extension/share-config-custom.xml
+     -->
+<alfresco-config>
+    <!--================================================================================================================
+        Make custom types and aspects visible in "Change Type" and "Manage Aspects" actions.
+         This will also make them visible when creating rules.
+        (will be merged with out-of-the-box configured types and aspects)
+    =============================================================================================================-->
+
+    <config evaluator="string-compare" condition="DocumentLibrary">
+        <aspects>
+            <visible>
+                <aspect name="acme:securityClassified"/>
+            </visible>
+            <addable> <!-- defaults to visible config -->
+            </addable>
+            <removeable> <!-- defaults to visible config -->
+            </removeable>
+        </aspects>
+        <types>
+            <!-- Define the ACME base doc type as decedent from cm:content -->
+            <type name="cm:content">
+                <subtype name="acme:document"/>
+            </type>
+        </types>
+    </config>
+
+    <!--================================================================================================================
+          Advanced Search Forms for types
+          (search forms for aspects are not available)
+      =============================================================================================================-->
+
+    <config evaluator="string-compare" condition="AdvancedSearch" replace="true">
+        <advanced-search>
+            <forms>
+                <!-- Standard out-of-the-box types -->
+                <form labelId="search.form.label.cm_content" descriptionId="search.form.desc.cm_content">cm:content
+                </form>
+                <form labelId="search.form.label.cm_folder" descriptionId="search.form.desc.cm_folder">cm:folder</form>
+
+                <!-- Custom type -->
+                <form labelId="form.label.advancedsearch.acmeDocument"
+                      descriptionId="form.description.advancedsearch.acmeDocument">acme:document
+                </form>
+            </forms>
+        </advanced-search>
+    </config>
+
+    <!--================================================================================================================
+         View, Edit, Create, and Search forms for custom types
+
+         The following form configurations for the custom types
+         have not been created from scratch. We have instead copied
+         out-of-the-box form configurations for cm:content and cm:folder
+         from the tomcat/webapps/share/WEB-INF/classes/alfresco/share-form-config.xml file
+         in a standard Alfresco installation (with the version matching)
+         and used them as a starting point.
+
+        =============================================================================================================-->
+
+    <!-- __________________________________ acme:document base type _________________________________________________-->
+
+    <!-- View and Edit forms for acme:document -->
+    <config evaluator="node-type" condition="acme:document">
+        <forms>
+            <!-- Default form configuration for the cm:content type -->
+            <form>
+                <field-visibility>
+                    <show id="cm:name"/>
+                    <show id="cm:title" force="true"/>
+                    <show id="cm:description" force="true"/>
+                    <show id="mimetype"/>
+                    <show id="cm:author" force="true"/>
+                    <show id="size" for-mode="view"/>
+                    <show id="cm:creator" for-mode="view"/>
+                    <show id="cm:created" for-mode="view"/>
+                    <show id="cm:modifier" for-mode="view"/>
+                    <show id="cm:modified" for-mode="view"/>
+
+                    <!-- tags and categories -->
+                    <show id="cm:taggable" for-mode="edit" force="true"/>
+                    <show id="cm:categories"/>
+
+                    <!-- cm:dublincore aspect -->
+                    <show id="cm:publisher"/>
+                    <show id="cm:contributor"/>
+                    <show id="cm:type"/>
+                    <show id="cm:identifier"/>
+                    <show id="cm:dcsource"/>
+                    <show id="cm:coverage"/>
+                    <show id="cm:rights"/>
+                    <show id="cm:subject"/>
+
+                    <!-- cm:complianceable aspect -->
+                    <show id="cm:removeAfter"/>
+
+                    <!-- cm:effectivity aspect -->
+                    <show id="cm:from"/>
+                    <show id="cm:to"/>
+
+                    <!--  cm:summarizable aspect -->
+                    <show id="cm:summary"/>
+
+                    <!-- cm:translatable aspect -->
+                    <show id="cm:translations"/>
+
+                    <!-- cm:localizable aspect -->
+                    <show id="cm:locale"/>
+
+                    <!-- cm:ownable aspect -->
+                    <show id="cm:owner"/>
+
+                    <!-- cm:attachable aspect -->
+                    <show id="cm:attachments"/>
+
+                    <!-- cm:emailed aspect -->
+                    <show id="cm:originator"/>
+                    <show id="cm:addressee"/>
+                    <show id="cm:addressees"/>
+                    <show id="cm:sentdate"/>
+                    <show id="cm:subjectline"/>
+
+                    <!-- exif:exif aspect -->
+                    <show id="exif:dateTimeOriginal"/>
+                    <show id="exif:pixelXDimension"/>
+                    <show id="exif:pixelYDimension"/>
+                    <show id="exif:exposureTime"/>
+                    <show id="exif:fNumber"/>
+                    <show id="exif:flash"/>
+                    <show id="exif:focalLength"/>
+                    <show id="exif:isoSpeedRatings"/>
+                    <show id="exif:manufacturer"/>
+                    <show id="exif:model"/>
+                    <show id="exif:software"/>
+                    <show id="exif:orientation"/>
+                    <show id="exif:xResolution"/>
+                    <show id="exif:yResolution"/>
+                    <show id="exif:resolutionUnit"/>
+
+                    <!-- audio:audio aspect -->
+                    <show id="audio:album"/>
+                    <show id="audio:artist"/>
+                    <show id="audio:composer"/>
+                    <show id="audio:engineer"/>
+                    <show id="audio:genre"/>
+                    <show id="audio:trackNumber"/>
+                    <show id="audio:releaseDate"/>
+                    <show id="audio:sampleRate"/>
+                    <show id="audio:sampleType"/>
+                    <show id="audio:channelType"/>
+                    <show id="audio:compressor"/>
+
+                    <!-- cm:indexControl aspect -->
+                    <show id="cm:isIndexed"/>
+                    <show id="cm:isContentIndexed"/>
+
+                    <!-- cm:geographic aspect -->
+                    <show id="cm:latitude"/>
+                    <show id="cm:longitude"/>
+
+                    <!-- surf:widget aspect -->
+                    <show id="surf:widgetType"/>
+                    <show id="surf:mid"/>
+                    <show id="surf:label"/>
+
+                    <!-- ACME custom props -->
+                    <show id="acme:documentId" force="true"/>
+                    <show id="acme:securityClassification"/>
+                </field-visibility>
+                <appearance>
+                    <field id="cm:name">
+                        <control>
+                            <control-param name="maxLength">255</control-param>
+                        </control>
+                    </field>
+                    <field id="cm:title">
+                        <control template="/org/alfresco/components/form/controls/textfield.ftl"/>
+                    </field>
+                    <field id="cm:description">
+                        <control>
+                            <control-param name="activateLinks">true</control-param>
+                        </control>
+                    </field>
+
+                    <set id="cm:content2cols" template="/org/alfresco/components/form/2-column-set.ftl"/>
+
+                    <field set="cm:content2cols" id="mimetype">
+                        <control template="/org/alfresco/components/form/controls/mimetype.ftl"/>
+                    </field>
+
+                    <field set="cm:content2cols" id="size">
+                        <control template="/org/alfresco/components/form/controls/size.ftl"/>
+                    </field>
+                    <field set="cm:content2cols" id="cm:creator"/>
+                    <field set="cm:content2cols" id="cm:created"/>
+                    <field set="cm:content2cols" id="cm:modifier"/>
+                    <field set="cm:content2cols" id="cm:modified"/>
+
+                    <field id="cm:taggable">
+                        <control>
+                            <control-param name="compactMode">true</control-param>
+                            <control-param name="params">aspect=cm:taggable</control-param>
+                            <control-param name="createNewItemUri">/api/tag/workspace/SpacesStore</control-param>
+                            <control-param name="createNewItemIcon">tag</control-param>
+                        </control>
+                    </field>
+                    <field id="cm:categories">
+                        <control>
+                            <control-param name="compactMode">true</control-param>
+                        </control>
+                    </field>
+                    <field id="cm:originator" read-only="true"/>
+                    <field id="cm:addressee" read-only="true"/>
+                    <field id="cm:addressees" read-only="true"/>
+                    <field id="cm:sentdate" read-only="true"/>
+                    <field id="cm:subjectline" read-only="true"/>
+
+                    <!-- ACME Props appearance -->
+                    <set id="acmeDocSet" appearance="bordered-panel" label-id="form.set.label.acme.document"/>
+                    <field id="acme:documentId" label-id="form.field.label.acme.documentId" set="acmeDocSet">
+                        <control template="/org/alfresco/components/form/controls/textfield.ftl"/>
+                    </field>
+                    <field id="acme:securityClassification" label-id="form.field.label.acme.securityClassification"
+                           set="acmeDocSet"/>
+                </appearance>
+            </form>
+
+            <!-- Document Library pop-up Edit Metadata form -->
+            <form id="doclib-simple-metadata">
+                <field-visibility>
+                    <show id="cm:name"/>
+                    <show id="cm:title" force="true"/>
+                    <show id="cm:description" force="true"/>
+                    <!-- tags and categories -->
+                    <show id="cm:taggable" for-mode="edit" force="true"/>
+                    <show id="cm:categories"/>
+
+                    <!-- ACME custom props -->
+                    <show id="acme:documentId" force="true"/>
+                    <show id="acme:securityClassification"/>
+                </field-visibility>
+                <edit-form template="../documentlibrary/forms/doclib-simple-metadata.ftl"/>
+                <appearance>
+                    <field id="cm:name">
+                        <control>
+                            <control-param name="maxLength">255</control-param>
+                        </control>
+                    </field>
+                    <field id="cm:title">
+                        <control template="/org/alfresco/components/form/controls/textfield.ftl"/>
+                    </field>
+                    <field id="cm:description">
+                        <control>
+                            <control-param name="activateLinks">true</control-param>
+                        </control>
+                    </field>
+                    <field id="cm:taggable">
+                        <control>
+                            <control-param name="compactMode">true</control-param>
+                            <control-param name="params">aspect=cm:taggable</control-param>
+                            <control-param name="createNewItemUri">/api/tag/workspace/SpacesStore</control-param>
+                            <control-param name="createNewItemIcon">tag</control-param>
+                        </control>
+                    </field>
+                    <field id="cm:categories">
+                        <control>
+                            <control-param name="compactMode">true</control-param>
+                        </control>
+                    </field>
+
+                    <!-- ACME Props appearance -->
+                    <set id="acmeDocSet" appearance="bordered-panel" label-id="form.set.label.acme.document"/>
+                    <field id="acme:documentId" label-id="form.field.label.acme.documentId" set="acmeDocSet">
+                        <control template="/org/alfresco/components/form/controls/textfield.ftl"/>
+                    </field>
+                    <field id="acme:securityClassification" label-id="form.field.label.acme.securityClassification"
+                           set="acmeDocSet"/>
+                </appearance>
+            </form>
+
+            <!-- Document Library Inline Edit form -->
+            <form id="doclib-inline-edit">
+                <field-visibility>
+                    <show id="cm:name"/>
+                    <show id="cm:content" force="true"/>
+                    <show id="cm:title" force="true"/>
+                    <show id="cm:description" force="true"/>
+
+                    <!-- ACME custom props -->
+                    <show id="acme:documentId" force="true"/>
+                    <show id="acme:securityClassification"/>
+                </field-visibility>
+                <appearance>
+                    <field id="cm:name">
+                        <control>
+                            <control-param name="maxLength">255</control-param>
+                        </control>
+                    </field>
+                    <field id="cm:title">
+                        <control template="/org/alfresco/components/form/controls/textfield.ftl"/>
+                    </field>
+                    <field id="cm:content" label-id="">
+                        <control>
+                            <control-param name="editorAppearance">explorer</control-param>
+                            <control-param name="forceEditor">true</control-param>
+                        </control>
+                    </field>
+
+                    <!-- ACME Props appearance -->
+                    <set id="acmeDocSet" appearance="bordered-panel" label-id="form.set.label.acme.document"/>
+                    <field id="acme:documentId" label-id="form.field.label.acme.documentId" set="acmeDocSet">
+                        <control template="/org/alfresco/components/form/controls/textfield.ftl"/>
+                    </field>
+                    <field id="acme:securityClassification" label-id="form.field.label.acme.securityClassification"
+                           set="acmeDocSet"/>
+                </appearance>
+            </form>
+        </forms>
+    </config>
+
+    <!-- Create and search forms for acme:document -->
+    <config evaluator="model-type" condition="acme:document">
+        <forms>
+            <form>
+                <field-visibility>
+                    <show id="cm:name"/>
+                    <show id="cm:content" force="true"/>
+                    <show id="cm:title" force="true"/>
+                    <show id="cm:description" force="true"/>
+                    <show id="mimetype"/>
+                    <show id="app:editInline" force="true"/>
+
+                    <!-- ACME custom props -->
+                    <show id="acme:documentId" force="true"/>
+                    <show id="acme:securityClassification"/>
+                </field-visibility>
+                <appearance>
+                    <field id="cm:name">
+                        <control>
+                            <control-param name="maxLength">255</control-param>
+                        </control>
+                    </field>
+                    <field id="cm:title">
+                        <control template="/org/alfresco/components/form/controls/textfield.ftl"/>
+                    </field>
+                    <field id="cm:content" label-id="">
+                        <control>
+                            <control-param name="editorAppearance">explorer</control-param>
+                        </control>
+                    </field>
+                    <field id="mimetype">
+                        <control template="/org/alfresco/components/form/controls/hidden.ftl">
+                            <control-param name="contextProperty">mimeType</control-param>
+                        </control>
+                    </field>
+                    <field id="app:editInline">
+                        <control template="/org/alfresco/components/form/controls/hidden.ftl">
+                            <control-param name="contextProperty">editInline</control-param>
+                        </control>
+                    </field>
+
+                    <!-- ACME Props appearance -->
+                    <set id="acmeDocSet" appearance="bordered-panel" label-id="form.set.label.acme.document"/>
+                    <field id="acme:documentId" label-id="form.field.label.acme.documentId" set="acmeDocSet">
+                        <control template="/org/alfresco/components/form/controls/textfield.ftl"/>
+                    </field>
+                    <field id="acme:securityClassification" label-id="form.field.label.acme.securityClassification"
+                           set="acmeDocSet"/>
+                </appearance>
+            </form>
+            <!-- Search form -->
+            <form id="search">
+                <field-visibility>
+                    <show id="cm:name"/>
+                    <show id="cm:title" force="true"/>
+                    <show id="cm:description" force="true"/>
+                    <show id="mimetype"/>
+                    <show id="cm:modified"/>
+                    <show id="cm:modifier"/>
+
+                    <!-- ACME custom props -->
+                    <show id="acme:documentId" force="true"/>
+                    <show id="acme:securityClassification"/>
+                </field-visibility>
+                <appearance>
+                    <field id="mimetype">
+                        <control template="/org/alfresco/components/form/controls/mimetype.ftl"/>
+                    </field>
+                    <field id="cm:modifier">
+                        <control>
+                            <control-param name="forceEditable">true</control-param>
+                        </control>
+                    </field>
+                    <field id="cm:modified">
+                        <control template="/org/alfresco/components/form/controls/daterange.ftl"/>
+                    </field>
+
+                    <!-- ACME Props appearance -->
+                    <set id="acmeDocSet" appearance="bordered-panel" label-id="form.set.label.acme.document"/>
+                    <field id="acme:documentId" label-id="form.field.label.acme.documentId" set="acmeDocSet">
+                        <control template="/org/alfresco/components/form/controls/textfield.ftl"/>
+                    </field>
+                    <field id="acme:securityClassification" label-id="form.field.label.acme.securityClassification"
+                           set="acmeDocSet"/>
+                </appearance>
+            </form>
+        </forms>
+    </config>
+
+
+</alfresco-config>
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/resources/META-INF/share-config-custom.xml.sample
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/resources/META-INF/share-config-custom.xml.sample
@@ -1,14 +0,0 @@
-<!-- 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:
-             allinone/share-war/src/main/resources/alfresco/web-extension/share-config-custom.xml file
-     -->
-<alfresco-config>
-
-
-</alfresco-config>
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/resources/alfresco/web-extension/messages/artifactId.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/rootArtifactId-share-jar/src/main/resources/alfresco/web-extension/messages/artifactId.properties
@@ -6,4 +6,20 @@
 #   Doc Lib Action Forms labels
 #

+# Labels for custom types and aspects
+# Used in "Manage Aspects" and "Change Type" dialogs
+#
+type.acme_document=ACME Document
+aspect.acme_securityClassified=Security Classified
+
+# View,Edit,Search,Create Form labels for types and aspects
+#
+form.set.label.acme.document= ACME Document Information
+form.field.label.acme.documentId=ACME Document Id
+form.field.label.acme.securityClassification=Security Classification
+
+# Advanced Search Form labels (only for types)
+#
+form.label.advancedsearch.acmeDocument=ACME Documents
+form.description.advancedsearch.acmeDocument=Search for any ACME Documents

--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.bat
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.bat
@@ -0,0 +1,9 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::      Dev environment startup script for Alfresco Community     ::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+@echo off
+
+set MAVEN_OPTS=-Xms256m -Xmx2G
+
+mvnDebug clean install alfresco:run
+
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.sh
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+MAVEN_OPTS="-Xms256m -Xmx2G" mvnDebug clean install alfresco:run
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@@ -10,6 +10,7 @@
    <packaging>pom</packaging>

    <properties>
+        <!-- Alfresco Maven Plugin version to use -->
        <alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -29,43 +30,33 @@

        <!-- Properties used in dependency declarations, you don't need to change these -->
        <alfresco.groupId>org.alfresco</alfresco.groupId>
-        <alfresco.platform.war.artifactId>alfresco-platform</alfresco.platform.war.artifactId>
        <alfresco.share.war.artifactId>share</alfresco.share.war.artifactId>
+        <!-- Platform WAR artifact, change to 'alfresco-enterprise' if using Enterprise Edition -->
+        <alfresco.platform.war.artifactId>alfresco-platform</alfresco.platform.war.artifactId>

        <!-- Alfresco Platform and Share webapp versions, these are the original Alfresco webapps that will be
             customized and then deployed and run by the tomcat maven plugin when
             executing for example $ mvn clean install alfresco:run -->
-        <alfresco.platform.version>5.2.a-EA</alfresco.platform.version>
-        <alfresco.share.version>5.1.g</alfresco.share.version>
+        <alfresco.platform.version>5.2.b-EA</alfresco.platform.version>
+        <alfresco.share.version>5.2.a-EA</alfresco.share.version>

        <!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
-        <alfresco.surf.version>6.5</alfresco.surf.version>
+        <alfresco.surf.version>6.6</alfresco.surf.version>

        <!-- Aikau framework version, it is released separately, so it can be useful to be able
             to bring in newer versions with bug fixes etc -->
-        <aikau.version>1.0.82</aikau.version>
-
-        <!-- 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>
+        <aikau.version>1.0.85</aikau.version>

        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
        <jrebel.version>1.1.6</jrebel.version>

-        <!-- Environment to use, Alfresco Maven Plugin will copy alfresco-global.properties from this directory -->
+        <!-- Environment to use, Alfresco Maven Plugin will
+             copy alfresco-global-*.properties files from this directory, such as src/test/properties/local -->
        <env>local</env>
+
+        <!-- Compile with Java 7, default is 5 -->
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
    </properties>

    <dependencyManagement>
@@ -153,10 +144,82 @@
                        </dependency>
                    </dependencies>
                </plugin>
+
+                <!-- Filter resources in any sub-project with this config -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.0.1</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                        <nonFilteredFileExtensions> <!-- jpg, jpeg, gif, bmp and png are added automatically -->
+                            <nonFilteredFileExtension>ftl</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>acp</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>
+                            <nonFilteredFileExtension>css</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>ico</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>psd</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>js</nonFilteredFileExtension>
+                        </nonFilteredFileExtensions>
+                    </configuration>
+                </plugin>
            </plugins>
        </pluginManagement>

+        <!-- Make sure resources in sub-projects are filtered -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
        <plugins>
+            <!-- Filter the test resource files in the AIO parent project, and do property substitutions.
+                 We need this config so this is done before the Alfresco Maven Plugin 'run' is executed. -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.1</version>
+                <inherited>false</inherited>
+                <!-- Run only for the AIO parent Project -->
+                <executions>
+                    <execution>
+                        <id>copy-and-filter-test-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                            <resources>
+                                <testResource>
+                                    <directory>src/test/resources</directory>
+                                    <filtering>true</filtering>
+                                </testResource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
            <!--
                The Alfresco Maven Plugin contains all the logic to run the extension
                in an embedded Tomcat with the H2 database.
@@ -177,6 +240,8 @@
                    <enableSolr>true</enableSolr>
                    <!-- We need Share webapp, so we got a UI for working with the Repo -->
                    <enableShare>true</enableShare>
+                    <!-- Enable the REST API Explorer -->
+                    <enableApiExplorer>true</enableApiExplorer>

                    <!--
                        JARs and AMPs that should be overlayed/applied to the Platform/Repository WAR
@@ -203,8 +268,8 @@
                    -->
                    <shareModules>
                        <moduleDependency>
-                            <!-- Bring in a newer version, can coexist with older versions in the WAR disttribution,
-                                 newest version is picked -->
+                            <!-- Bring in a newer version of Aikau, can coexist with older versions in the
+                                WAR distribution, newest version is picked. -->
                            <groupId>${alfresco.groupId}</groupId>
                            <artifactId>aikau</artifactId>
                            <version>${aikau.version}</version>
@@ -220,33 +285,6 @@
                </configuration>
            </plugin>

-            <!-- Filter the test resource files in the AIO parent project, and do property substitutions.
-                 We need this here to get it done before the Alfresco Maven Plugin run is executed. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.1</version>
-                <inherited>false</inherited> <!-- Run only for the AIO parent Project -->
-                <executions>
-                    <execution>
-                        <id>copy-and-filter-test-resources</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
-                            <resources>
-                                <testResource>
-                                    <directory>src/test/resources</directory>
-                                    <filtering>true</filtering>
-                                </testResource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
            <!-- Hot reloading with JRebel -->
            <plugin>
                <groupId>org.zeroturnaround</groupId>
@@ -262,26 +300,29 @@
                    </execution>
                </executions>
                <configuration>
-                    <!--
-                      addResourcesDirToRebelXml - default is false
-                      Required if the resource directories are to be added to rebel.xml
-                    -->
-                    <addResourcesDirToRebelXml>true</addResourcesDirToRebelXml>
+                    <!-- For more information about how to configure JRebel plugin see:
+                         http://manuals.zeroturnaround.com/jrebel/standalone/maven.html#maven-rebel-xml -->
+                    <classpath>
+                        <fallback>all</fallback>
+                        <resources>
+                            <resource>
+                                <!--
+                                Empty resource element marks default configuration. By
+                                default it is placed first in generated configuration.
+                                -->
+                            </resource>
+                        </resources>
+                    </classpath>

-                    <!-- Always generate the rebel.xml file no matter what timestamps -->
+                    <!--
+                      alwaysGenerate - default is false
+                      If 'false' - rebel.xml is generated if timestamps of pom.xml and the current rebel.xml file are not equal.
+                      If 'true' - rebel.xml will always be generated
+                    -->
                    <alwaysGenerate>true</alwaysGenerate>
                </configuration>
            </plugin>
        </plugins>
-
-        <resources>
-            <!-- Filter the resource files in all the sub-projects, and do property substitutions -->
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
    </build>

    <!--
@@ -300,6 +341,11 @@
                <updatePolicy>daily</updatePolicy>
            </snapshots>
        </repository>
+        <!-- Alfresco Enterprise Edition Artifacts, put username/pwd for server in settings.xml -->
+        <repository>
+            <id>alfresco-private-repository</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+        </repository>
    </repositories>
    <pluginRepositories>
        <pluginRepository>
@@ -315,5 +361,4 @@
            </snapshots>
        </pluginRepository>
    </pluginRepositories>
-
 </project>
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
@@ -5,5 +5,5 @@

 set MAVEN_OPTS=-Xms256m -Xmx2G

-mvn clean install -DskipTests=true alfresco:run
+mvn clean install alfresco:run

--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash

-MAVEN_OPTS="-Xms256m -Xmx2G" mvn clean install -DskipTests=true alfresco:run
+MAVEN_OPTS="-Xms256m -Xmx2G" mvn clean install alfresco:run
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/license/README.md
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/license/README.md
@@ -0,0 +1,10 @@
+# Enterprise License location
+
+Put the Alfresco Enterprise license file in this directory.
+It will then be copied into the Platform WAR in the  
+WEB-INF/classes/alfresco/extension/license directory.
+
+And then not be part of any other classpaths.
+   
+  
+ 
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-enterprise.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-enterprise.properties
@@ -0,0 +1,72 @@
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#    
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    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
+# -------------------
+
+########################################################################################################################
+# Alfresco configuration for running locally with Enterprise Database, such as SQL Server, Oracle etc
+#
+# Configuration when running Tomcat embedded from Maven.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
+
+dir.root=${alfresco.data.location}
+
+# 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
+
+index.subsystem.name=solr4
+solr.host=localhost
+solr.port=8080
+solr.secureComms=none
+
+# 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=buildonly
+
+# 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
+
+# Alfresco Repository Enterprise Database Configuration, such as SQL Server, Oracle etc
+# The Enterprise Driver is brought in via the tomcat7-maven-plugin as a dependency.
+db.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+db.url=jdbc:sqlserver://localhost:1433;databaseName=alfrescoaio
+db.username=alfresco
+db.password=alfresco
+db.pool.initial=10
+db.pool.max=100
+
+# File servers related properties
+# For local runs we disable CIFS and FTP
+cifs.enabled=false
+ftp.enabled=false
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-h2.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-h2.properties
@@ -0,0 +1,76 @@
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#    
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    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
+# -------------------
+
+########################################################################################################################
+# Alfresco configuration for running locally with H2 Database
+#
+# Configuration when running Tomcat embedded from Maven.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
+
+dir.root=${alfresco.data.location}
+
+# 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
+
+index.subsystem.name=solr4
+solr.host=localhost
+solr.port=8080
+solr.secureComms=none
+
+# 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=buildonly
+
+# 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
+
+# Alfresco Repository H2 Database configuration.
+# The H2 database implementation and Driver 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
+db.driver=org.h2.jdbcx.JdbcDataSource
+db.url=jdbc:h2:${alfresco.data.location}/h2_data/alf_dev;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0
+db.username=alfresco
+db.password=alfresco
+db.pool.initial=10
+db.pool.max=100
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+
+# File servers related properties
+# For local runs we disable CIFS and FTP
+cifs.enabled=false
+ftp.enabled=false
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-mysql.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-mysql.properties
@@ -0,0 +1,72 @@
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#    
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    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
+# -------------------
+
+########################################################################################################################
+# Alfresco configuration for running locally with MySQL Database
+#
+# Configuration when running Tomcat embedded from Maven.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
+
+dir.root=${alfresco.data.location}
+
+# 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
+
+index.subsystem.name=solr4
+solr.host=localhost
+solr.port=8080
+solr.secureComms=none
+
+# 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=buildonly
+
+# 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
+
+# Alfresco Repository MySQL Database configuration.
+# The MySQL Driver is brought in via the tomcat7-maven-plugin as a dependency.
+db.driver=org.gjt.mm.mysql.Driver
+db.url=jdbc:mysql://localhost:3306/alfrescoaio?useUnicode=yes&characterEncoding=UTF-8
+db.username=alfresco
+db.password=alfresco
+db.pool.initial=10
+db.pool.max=100
+
+# File servers related properties
+# For local runs we disable CIFS and FTP
+cifs.enabled=false
+ftp.enabled=false
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-postgresql.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-postgresql.properties
@@ -16,10 +16,9 @@
 # -------------------

 ########################################################################################################################
-# Alfresco configuration for running locally
+# Alfresco configuration for running locally with PostgreSQL Database
 #
 # 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.
 ########################################################################################################################

@@ -58,14 +57,14 @@ wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060
 # Fail or not when there are node integrity checker errors
 integrity.failOnError=true

-# Database connection properties
-db.driver=${alfresco.db.datasource.class}
-db.url=${alfresco.db.url}
-db.username=${alfresco.db.username}
-db.password=${alfresco.db.password}
+# Alfresco Repository PostgreSQL Database configuration.
+# The PostgreSQL Driver is brought in via the tomcat7-maven-plugin as a dependency.
+db.driver=org.postgresql.Driver
+db.url=jdbc:postgresql://localhost:5432/alfrescoaio
+db.username=alfresco
+db.password=alfresco
 db.pool.initial=10
 db.pool.max=100
-hibernate.dialect=org.hibernate.dialect.H2Dialect

 # File servers related properties
 # For local runs we disable CIFS and FTP
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/dev-log4j.properties
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/dev-log4j.properties
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 # Set root logger level to error
 log4j.rootLogger=error, Console, File

@@ -261,4 +264,13 @@ log4j.logger.org.alfresco.repo.usage.RepoUsageMonitor=info

 # Authorization
 log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationService=info
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor=warn
+log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor=warn
+
+#-----------------------------------------------------------------------
+# Platform module logging
+#-----------------------------------------------------------------------
+log4j.logger.${package}.platformsample.DemoComponent=debug
+log4j.logger.${package}.platformsample.HelloWorldWebScript=debug
+
+
+
--- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/goal.txt
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/goal.txt
@@ -1 +1 @@
-verify
+install
--- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties
@@ -1,5 +0,0 @@
-version=0.1-SNAPSHOT
-groupId=archetype.it
-artifactId=allInOneTestRunEnterprise
-package=it.pkg
-
--- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt
@@ -1 +0,0 @@
-verify -Prun -Penterprise -Dmaven.tomcat.fork=true
--- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/goal.txt
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/goal.txt
@@ -1 +1 @@
-verify -Prun -Dmaven.tomcat.fork=true
+install alfresco:run -Dmaven.tomcat.fork=true
--- a/archetypes/alfresco-platform-jar-archetype/pom.xml
+++ b/archetypes/alfresco-platform-jar-archetype/pom.xml
@@ -3,16 +3,16 @@
  <modelVersion>4.0.0</modelVersion>

  <groupId>org.alfresco.maven.archetype</groupId>
-  <artifactId>alfresco-amp-archetype</artifactId>
+  <artifactId>alfresco-platform-jar-archetype</artifactId>

  <packaging>maven-archetype</packaging>
-  <name>Maven Alfresco SDK - Repository AMP Archetype</name>
-  <description>Sample project with full support for lifecycle and rapid development of Repository AMPs (Alfresco Module Packages)</description>
+  <name>Alfresco SDK - Platform JAR Archetype</name>
+  <description>Sample project with full support for lifecycle and rapid development of Platform/Repository JARs and AMPs (Alfresco Module Packages)</description>

  <parent>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.0-beta-2</version>
+    <version>3.0.0-beta-5</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

@@ -24,6 +24,8 @@
                <include>archetype-resources/pom.xml</include>
                <include>archetype-resources/run.sh</include>
                <include>archetype-resources/run.bat</include>
+                <include>archetype-resources/debug.sh</include>
+                <include>archetype-resources/debug.bat</include>
                <include>META-INF/maven/archetype-metadata.xml</include>
            </includes>
            <filtering>true</filtering>
@@ -34,15 +36,19 @@
                <exclude>archetype-resources/pom.xml</exclude>
                <exclude>archetype-resources/run.sh</exclude>
                <exclude>archetype-resources/run.bat</exclude>
+                <exclude>archetype-resources/debug.sh</exclude>
+                <exclude>archetype-resources/debug.bat</exclude>
                <exclude>META-INF/maven/archetype-metadata.xml</exclude>
            </excludes>
            <filtering>false</filtering>
        </resource>
      </resources>
+
      <plugins>
        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-resources-plugin</artifactId>
-            <version>2.7</version>
+            <version>${maven.resource.version}</version>
            <configuration>
                <useDefaultDelimiters>false</useDefaultDelimiters>
                <delimiters>
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -14,7 +14,7 @@
        <fileSet filtered="false" packaged="false" encoding="UTF-8">
            <directory>src/main/assembly</directory>
            <includes>
-                <include>**/*.xml</include>
+                <include>**</include>
            </includes>
        </fileSet>
        <fileSet filtered="true" packaged="true" encoding="UTF-8">
@@ -36,14 +36,18 @@
            </includes>
            <excludes>
                <exclude>**/*-context.xml</exclude>
-                <exclude>**/log4j.properties</exclude>
            </excludes>
        </fileSet>
        <fileSet encoding="UTF-8" filtered="true" packaged="false">
            <directory>src/main/resources</directory>
            <includes>
                <include>**/*-context.xml</include>
-                <include>**/log4j.properties</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="true">
+            <directory>src/test/resources</directory>
+            <includes>
+                <include>**/dev-log4j.properties</include>
            </includes>
        </fileSet>
        <fileSet encoding="UTF-8" filtered="false">
@@ -51,6 +55,9 @@
            <includes>
                <include>**</include>
            </includes>
+            <excludes>
+                <exclude>**/dev-log4j.properties</exclude>
+            </excludes>
        </fileSet>
        <fileSet encoding="UTF-8" filtered="false">
            <directory>src/test/properties</directory>
@@ -58,9 +65,17 @@
                <include>**/*.properties</include>
            </includes>
        </fileSet>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/test/license</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </fileSet>
        <fileSet encoding="UTF-8">
            <directory></directory>
            <includes>
+                <include>debug.sh</include>
+                <include>debug.bat</include>
                <include>run.sh</include>
                <include>run.bat</include>
                <include>README.md</include>
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/debug.bat
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/debug.bat
@@ -0,0 +1,9 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::      Dev environment startup script for Alfresco Community     ::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+@echo off
+
+set MAVEN_OPTS=-Xms256m -Xmx2G
+
+mvnDebug clean install alfresco:run
+
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/debug.sh
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/debug.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+MAVEN_OPTS="-Xms256m -Xmx2G" mvnDebug clean install alfresco:run
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml
@@ -10,6 +10,7 @@
    <packaging>jar</packaging>

    <properties>
+        <!-- Alfresco Maven Plugin version to use -->
        <alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -29,35 +30,26 @@

        <!-- Properties used in dependency declarations, you don't need to change these -->
        <alfresco.groupId>org.alfresco</alfresco.groupId>
+        <!-- Platform WAR artifact, change to 'alfresco-enterprise' if using Enterprise Edition -->
+        <alfresco.platform.war.artifactId>alfresco-platform</alfresco.platform.war.artifactId>

        <!-- Alfresco Platform webapp version, this is the original Alfresco webapp that will be
            customized and then deployed and run by the tomcat maven plugin when
            executing for example $ mvn clean install alfresco:run -->
-        <alfresco.platform.version>5.2.a-EA</alfresco.platform.version>
+        <alfresco.platform.version>5.2.b-EA</alfresco.platform.version>
        <!-- Alfresco Share version, so we can bring in correct alfresco-share-services artifact -->
-        <alfresco.share.version>5.1.g</alfresco.share.version>
-
-        <!-- 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.share.version>5.2.a-EA</alfresco.share.version>

        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
        <jrebel.version>1.1.6</jrebel.version>

-        <!-- Environment to use, Alfresco Maven Plugin will copy alfresco-global.properties from this directory -->
+        <!-- Environment to use, Alfresco Maven Plugin will
+             copy alfresco-global-*.properties files from this directory, such as src/test/properties/local -->
        <env>local</env>
+
+        <!-- Compile with Java 7, default is 5 -->
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
    </properties>

    <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco platform.
@@ -108,11 +100,12 @@
                    <enableSolr>true</enableSolr>
                    <!-- We don't need the share.war if we don't have any UI extensions -->
                    <enableShare>false</enableShare>
+                    <!-- Enable the REST API Explorer -->
+                    <enableApiExplorer>true</enableApiExplorer>

                    <!--
                       JARs and AMPs that should be overlayed/applied to the Platform/Repository WAR
                       (i.e. alfresco.war)
-                       No need to include our self...
                       -->
                    <platformModules>
                        <!-- This AMP is needed if we are going to access the platform webapp from a Share webapp -->
@@ -122,6 +115,14 @@
                            <version>${alfresco.share.version}</version>
                            <type>amp</type>
                        </moduleDependency>
+                        <!-- Bring in this JAR project, need to be included here, otherwise resources from META-INF
+                             will not be loaded, such as the test.html page
+                        -->
+                        <moduleDependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <version>${project.version}</version>
+                        </moduleDependency>
                    </platformModules>
                </configuration>
            </plugin>
@@ -167,16 +168,63 @@
                    </execution>
                </executions>
                <configuration>
-                    <!--
-                      addResourcesDirToRebelXml - default is false
-                      Required if the resource directories are to be added to rebel.xml
-                    -->
-                    <addResourcesDirToRebelXml>true</addResourcesDirToRebelXml>
+                    <!-- For more information about how to configure JRebel plugin see:
+                         http://manuals.zeroturnaround.com/jrebel/standalone/maven.html#maven-rebel-xml -->
+                    <classpath>
+                        <fallback>all</fallback>
+                        <resources>
+                            <resource>
+                                <!--
+                                Empty resource element marks default configuration. By
+                                default it is placed first in generated configuration.
+                                -->
+                            </resource>
+                        </resources>
+                    </classpath>

-                    <!-- Always generate the rebel.xml file no matter what timestamps -->
+                    <!--
+                      alwaysGenerate - default is false
+                      If 'false' - rebel.xml is generated if timestamps of pom.xml and the current rebel.xml file are not equal.
+                      If 'true' - rebel.xml will always be generated
+                    -->
                    <alwaysGenerate>true</alwaysGenerate>
                </configuration>
            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <nonFilteredFileExtensions> <!-- jpg, jpeg, gif, bmp and png are added automatically -->
+                        <nonFilteredFileExtension>ftl</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>acp</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>
+                        <nonFilteredFileExtension>css</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ico</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>psd</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>js</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
        </plugins>

        <resources>
@@ -211,6 +259,11 @@
                <updatePolicy>daily</updatePolicy>
            </snapshots>
        </repository>
+        <!-- Alfresco Enterprise Edition Artifacts, put username/pwd for server in settings.xml -->
+        <repository>
+            <id>alfresco-private-repository</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+        </repository>
    </repositories>
    <pluginRepositories>
        <pluginRepository>
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat
@@ -5,4 +5,4 @@

 set MAVEN_OPTS=-Xms256m -Xmx2G

-mvn clean install -DskipTests=true alfresco:run
+mvn clean install alfresco:run
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash

-MAVEN_OPTS="-Xms256m -Xmx2G" mvn clean install -DskipTests=true alfresco:run
+MAVEN_OPTS="-Xms256m -Xmx2G" mvn clean install alfresco:run
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml
@@ -12,12 +12,39 @@
    <includeBaseDirectory>false</includeBaseDirectory>

    <files>
+        <!-- Filter module.properties and put at top level in the AMP -->
        <file>
            <source>src/main/resources/alfresco/module/${project.artifactId}/module.properties</source>
            <filtered>true</filtered>
        </file>
+        <!-- Include AMP -> WAR mapping file (needed for custom mappings) -->
+        <file>
+            <source>src/main/assembly/file-mapping.properties</source>
+            <filtered>false</filtered>
+        </file>
    </files>

+    <fileSets>
+        <!-- Anything in the assembly/lib directory will end up in the /lib directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/lib</directory>
+            <outputDirectory>lib</outputDirectory>
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Anything in the assembly/web directory will end up in the /web directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/web</directory>
+            <outputDirectory>web</outputDirectory>
+            <filtered>true</filtered> <!-- Will filter files and substitute POM props such as for example ${project.name} -->
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+    <!-- Include the project artifact (JAR) in the /lib directory in the AMP -->
    <dependencySets>
        <dependencySet>
            <outputDirectory>lib</outputDirectory>
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/file-mapping.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/file-mapping.properties
@@ -0,0 +1,27 @@
+# Custom AMP to WAR location mappings
+
+#
+# The following property can be used to include the standard set of mappings.
+# The contents of this file will override any defaults.  The default is
+# 'true', i.e. the default mappings will be augmented or modified by values in
+# this file.
+#
+# Default mappings are:
+#
+# /config=/WEB-INF/classes
+# /lib=/WEB-INF/lib
+# /licenses=/WEB-INF/licenses
+# /web/jsp=/jsp
+# /web/css=/css
+# /web/images=/images
+# /web/scripts=/scripts
+# /web/php=/php
+#
+include.default=true
+
+#
+# Custom mappings.  If 'include.default' is false, then this is the complete set.
+# Map /web to / in AMP so we can override things like favicon.ico
+#
+/web=/
+
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/lib/README.md
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/lib/README.md
@@ -0,0 +1,21 @@
+# 3rd party libraries (JARs) that should be included in WAR
+
+Put here any 3rd party libraries (JARs) that are needed by customizations, 
+but that are not part of the out-of-the-box libraries in the *alfresco/WEB-INF/lib* 
+directory. 
+
+**Note**. Module dependency needs to be set to amp for the libs to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-platform-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+  
+**Important**. If you need to use a library that is available out-of-the-box, then
+               include it as a *provided* dependency in the module.
+  
+ 
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/web/README.md
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/web/README.md
@@ -0,0 +1,22 @@
+# Web resources that should override out-of-the-box files
+
+Put here any web resources that should override out-of-the-box
+web resources, such as favicon.ico. They will then end up in the 
+*/web* directory in the AMP, and applied to the WAR, and override
+any existing web resources in the Alfresco.WAR.
+
+**Note**. Module dependency needs to be set to amp for the web resources to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-platform-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+   
+**Important**. New web resources should not be located here, but instead 
+               in the usual place in the *src/main/resources/META-INF/resources* directory.
+  
+ 
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/DemoComponent.java
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/DemoComponent.java
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
 * @author Maurizio Pillitu
 */
 public class DemoComponent extends AbstractModuleComponent {
-    Log log = LogFactory.getLog(DemoComponent.class);
+    private static Log logger = LogFactory.getLog(DemoComponent.class);

    private NodeService nodeService;

@@ -55,8 +55,8 @@ public class DemoComponent extends AbstractModuleComponent {
    @Override
    protected void executeInternal() throws Throwable {
        System.out.println("DemoComponent has been executed");
-        log.debug("Test debug logging. Congratulation your JAR Module is working");
-        log.info("This is only for information purposed. Better remove me from the log in Production");
+        logger.debug("Test debug logging. Congratulation your JAR Module is working");
+        logger.info("This is only for information purposed. Better remove me from the log in Production");
    }

    /**
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/HelloWorldWebScript.java
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/HelloWorldWebScript.java
@@ -23,6 +23,8 @@ import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;

 import java.util.HashMap;
 import java.util.Map;
@@ -34,10 +36,15 @@ import java.util.Map;
 * @since 2.1.0
 */
 public class HelloWorldWebScript extends DeclarativeWebScript {
+    private static Log logger = LogFactory.getLog(HelloWorldWebScript.class);
+
    protected Map<String, Object> executeImpl(
            WebScriptRequest req, Status status, Cache cache) {
        Map<String, Object> model = new HashMap<String, Object>();
        model.put("fromJava", "HelloFromJava");
+
+        logger.debug("Your 'Hello World' Web Script was called!");
+
        return model;
    }
 }
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/artifactId/context/bootstrap-context.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/artifactId/context/bootstrap-context.xml
@@ -18,6 +18,12 @@
                <value>alfresco/module/${project.artifactId}/model/workflow-model.xml</value>
            </list>
        </property>
+        <property name="labels">
+            <list>
+                <!-- Bootstrap Resource Bundles for the content model types, aspects, properties etc -->
+                <value>alfresco/module/${project.artifactId}/messages/content-model</value>
+            </list>
+        </property>
    </bean>

    <bean id="${package}.sampleprocess.workflowBootstrap" parent="workflowDeployer">
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/artifactId/context/service-context.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/artifactId/context/service-context.xml
@@ -25,15 +25,15 @@
    <bean id="${package}.exampleBean" class="${package}.platformsample.Demo" init-method="init" />

    <!-- A simple module component that will be executed once.
-         Note. this module component will only be executed once, and then there will be an entry for it in the Repo.
-         So doing for example $ mvn clean install -Prun twice will only execute this component the first time.
+         Note. this module component will only be executed once, and then there will be an entry for it in the Repo DB.
+         So doing for example $ mvn clean install alfresco:run twice will only execute this component the first time.
         You need to remove /alf_data_dev for it to be executed again. -->
    <bean id="${package}.exampleComponent" class="${package}.platformsample.DemoComponent" parent="module.baseComponent" >
        <property name="moduleId" value="${artifactId}" />  <!-- See module.properties -->
        <property name="name" value="exampleComponent" />
        <property name="description" value="A demonstration component" />
        <property name="sinceVersion" value="1.0" />
-        <property name="appliesFromVersion" value="1.0" />
+        <property name="appliesFromVersion" value="0.99" /> <!-- 1.0 would not work here when using SNAPSHOT version in project  -->
        <property name="nodeService" ref="NodeService" />
        <property name="nodeLocatorService" ref="nodeLocatorService" />
    </bean>
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/artifactId/log4j.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/artifactId/log4j.properties
@@ -1,43 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#-----------------------------------------------------------------------
-# ${artifactId} module log4j.properties
-#
-#   NOTE
-#   ----
-#      Log4j uses the following logging levels:
-#      debug,info,warn,error,fatal
-#
-#      To set the logging level of {fullClassName} to {loglevel},
-#      add a line to this file of the following form:
-#   
-#               log4j.logger.{fullClassName}={loglevel}
-#
-#      For example, to make 'com.example.MyExample' produce 'debug'
-#      logs, add a line like this:
-#   
-#               log4j.logger.com.example.MyExample=debug
-#
-#
-#   WARNING
-#   -------
-#       Log properties in this log4j.properties file override/augment
-#       those in the webapp's main log4j.properties.
-#    
-#-----------------------------------------------------------------------
-log4j.logger.${package}.platformsample.DemoComponent=debug
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/artifactId/messages/content-model.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/artifactId/messages/content-model.properties
@@ -0,0 +1,6 @@
+# This file should contain content model labels
+
+acme_contentModel.type.acme_document.title=ACME Document
+acme_contentModel.aspect.acme_securityClassified.title=ACME Security Classified
+acme_contentModel.property.acme_documentId.title=Document Id
+acme_contentModel.property.acme_securityClassification.title=Security Classification
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/license/README.md
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/license/README.md
@@ -0,0 +1,10 @@
+# Enterprise License location
+
+Put the Alfresco Enterprise license file in this directory.
+It will then be copied into the Platform WAR in the  
+WEB-INF/classes/alfresco/extension/license directory.
+
+And then not be part of any other classpaths.
+   
+  
+ 
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-enterprise.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-enterprise.properties
@@ -0,0 +1,72 @@
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#    
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    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
+# -------------------
+
+########################################################################################################################
+# Alfresco configuration for running locally with Enterprise Database, such as SQL Server, Oracle etc
+#
+# Configuration when running Tomcat embedded from Maven.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
+
+dir.root=${alfresco.data.location}
+
+# 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
+
+index.subsystem.name=solr4
+solr.host=localhost
+solr.port=8080
+solr.secureComms=none
+
+# 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=buildonly
+
+# 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
+
+# Alfresco Repository Enterprise Database Configuration, such as SQL Server, Oracle etc
+# The Enterprise Driver is brought in via the tomcat7-maven-plugin as a dependency.
+db.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+db.url=jdbc:sqlserver://localhost:1433;databaseName=alfrescoaio
+db.username=alfresco
+db.password=alfresco
+db.pool.initial=10
+db.pool.max=100
+
+# File servers related properties
+# For local runs we disable CIFS and FTP
+cifs.enabled=false
+ftp.enabled=false
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-h2.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-h2.properties
@@ -0,0 +1,76 @@
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#    
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    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
+# -------------------
+
+########################################################################################################################
+# Alfresco configuration for running locally with H2 Database
+#
+# Configuration when running Tomcat embedded from Maven.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
+
+dir.root=${alfresco.data.location}
+
+# 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
+
+index.subsystem.name=solr4
+solr.host=localhost
+solr.port=8080
+solr.secureComms=none
+
+# 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=buildonly
+
+# 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
+
+# Alfresco Repository H2 Database configuration.
+# The H2 database implementation and Driver 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
+db.driver=org.h2.jdbcx.JdbcDataSource
+db.url=jdbc:h2:${alfresco.data.location}/h2_data/alf_dev;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0
+db.username=alfresco
+db.password=alfresco
+db.pool.initial=10
+db.pool.max=100
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+
+# File servers related properties
+# For local runs we disable CIFS and FTP
+cifs.enabled=false
+ftp.enabled=false
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-mysql.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-mysql.properties
@@ -0,0 +1,72 @@
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#    
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    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
+# -------------------
+
+########################################################################################################################
+# Alfresco configuration for running locally with MySQL Database
+#
+# Configuration when running Tomcat embedded from Maven.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
+
+dir.root=${alfresco.data.location}
+
+# 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
+
+index.subsystem.name=solr4
+solr.host=localhost
+solr.port=8080
+solr.secureComms=none
+
+# 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=buildonly
+
+# 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
+
+# Alfresco Repository MySQL Database configuration.
+# The MySQL Driver is brought in via the tomcat7-maven-plugin as a dependency.
+db.driver=org.gjt.mm.mysql.Driver
+db.url=jdbc:mysql://localhost:3306/alfrescoaio?useUnicode=yes&characterEncoding=UTF-8
+db.username=alfresco
+db.password=alfresco
+db.pool.initial=10
+db.pool.max=100
+
+# File servers related properties
+# For local runs we disable CIFS and FTP
+cifs.enabled=false
+ftp.enabled=false
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-postgresql.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global-postgresql.properties
@@ -16,10 +16,9 @@
 # -------------------

 ########################################################################################################################
-# Alfresco configuration for running locally
+# Alfresco configuration for running locally with PostgreSQL Database
 #
 # 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.
 ########################################################################################################################

@@ -44,6 +43,9 @@ solr.secureComms=none

 # 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=buildonly

 # 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
@@ -55,14 +57,14 @@ wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060
 # Fail or not when there are node integrity checker errors
 integrity.failOnError=true

-# Database connection properties
-db.driver=${alfresco.db.datasource.class}
-db.url=${alfresco.db.url}
-db.username=${alfresco.db.username}
-db.password=${alfresco.db.password}
+# Alfresco Repository PostgreSQL Database configuration.
+# The PostgreSQL Driver is brought in via the tomcat7-maven-plugin as a dependency.
+db.driver=org.postgresql.Driver
+db.url=jdbc:postgresql://localhost:5432/alfrescoaio
+db.username=alfresco
+db.password=alfresco
 db.pool.initial=10
 db.pool.max=100
-hibernate.dialect=org.hibernate.dialect.H2Dialect

 # File servers related properties
 # For local runs we disable CIFS and FTP
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/dev-log4j.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/dev-log4j.properties
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 # Set root logger level to error
 log4j.rootLogger=error, Console, File

@@ -261,4 +264,10 @@ log4j.logger.org.alfresco.repo.usage.RepoUsageMonitor=info

 # Authorization
 log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationService=info
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor=warn
+log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor=warn
+
+#-----------------------------------------------------------------------
+# Platform module logging
+#-----------------------------------------------------------------------
+log4j.logger.${package}.platformsample.DemoComponent=debug
+log4j.logger.${package}.platformsample.HelloWorldWebScript=debug
--- a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/basic/archetype.properties
@@ -1,5 +1,5 @@
 version=0.1-SNAPSHOT
 groupId=archetype.it
-artifactId=repoAmpTest
+artifactId=repoJarTest
 package=it.pkg

--- a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-basic/archetype.properties
+++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-basic/archetype.properties
@@ -1,4 +1,4 @@
 version=0.1-SNAPSHOT
 groupId=archetype.it
-artifactId=repoAmpTestRun
+artifactId=repoJarTestRun
 package=it.pkg
--- a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-basic/goal.txt
+++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-basic/goal.txt
@@ -1 +1 @@
-verify -Pamp-to-war -Dmaven.tomcat.fork=true
+verify alfresco:run -Dmaven.tomcat.fork=true
--- a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt
+++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt
@@ -1 +0,0 @@
-verify -Pamp-to-war -Penterprise -Dmaven.tomcat.fork=true
--- a/archetypes/alfresco-share-jar-archetype/pom.xml
+++ b/archetypes/alfresco-share-jar-archetype/pom.xml
@@ -3,18 +3,18 @@
    <modelVersion>4.0.0</modelVersion>

    <groupId>org.alfresco.maven.archetype</groupId>
-    <artifactId>share-amp-archetype</artifactId>
+    <artifactId>alfresco-share-jar-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
+    <name>Alfresco SDK - Share JAR Archetype</name>
+    <description>Share project with full support for lifecycle and rapid development of JARs and AMPs (Alfresco Module
        Packages)
    </description>

    <parent>
        <groupId>org.alfresco.maven</groupId>
        <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>3.0.0-beta-2</version>
+        <version>3.0.0-beta-5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -26,6 +26,8 @@
                    <include>archetype-resources/pom.xml</include>
                    <include>archetype-resources/run.sh</include>
                    <include>archetype-resources/run.bat</include>
+                    <include>archetype-resources/debug.sh</include>
+                    <include>archetype-resources/debug.bat</include>
                    <include>META-INF/maven/archetype-metadata.xml</include>
                </includes>
                <filtering>true</filtering>
@@ -36,6 +38,8 @@
                    <exclude>archetype-resources/pom.xml</exclude>
                    <exclude>archetype-resources/run.sh</exclude>
                    <exclude>archetype-resources/run.bat</exclude>
+                    <exclude>archetype-resources/debug.sh</exclude>
+                    <exclude>archetype-resources/debug.bat</exclude>
                    <exclude>META-INF/maven/archetype-metadata.xml</exclude>
                </excludes>
                <filtering>false</filtering>
@@ -44,8 +48,9 @@

        <plugins>
            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.7</version>
+                <version>${maven.resource.version}</version>
                <configuration>
                    <useDefaultDelimiters>false</useDefaultDelimiters>
                    <delimiters>
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -14,7 +14,7 @@
        <fileSet filtered="false" packaged="false" encoding="UTF-8">
            <directory>src/main/assembly</directory>
            <includes>
-                <include>**/*.xml</include>
+                <include>**</include>
            </includes>
        </fileSet>
        <fileSet filtered="true" packaged="true" encoding="UTF-8">
@@ -61,6 +61,8 @@
        <fileSet encoding="UTF-8">
            <directory></directory>
            <includes>
+                <include>debug.sh</include>
+                <include>debug.bat</include>
                <include>run.sh</include>
                <include>run.bat</include>
                <include>README.md</include>
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/debug.bat
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/debug.bat
@@ -0,0 +1,10 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::      Dev environment startup script for Alfresco Community.    ::
+::                                                                ::
+::      Note. requires Alfresco.war to be running in another      ::
+::      Tomcat on port 8080.                                      ::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+@echo off
+
+mvnDebug clean install alfresco:run
+
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/debug.sh
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/debug.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Note. requires Alfresco.war to be running in another Tomcat on port 8080
+
+mvnDebug clean install alfresco:run
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml
@@ -10,7 +10,8 @@
    <packaging>jar</packaging>

    <properties>
-	<alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version>
+        <!-- Alfresco Maven Plugin version to use -->
+	    <alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

@@ -21,14 +22,14 @@
        <!-- Alfresco Share webapp version, this is the original Alfresco webapp that will be
            customized and then deployed and run by the tomcat maven plugin when
            executing for example $ mvn clean install alfresco:run -->
-        <alfresco.share.version>5.1.g</alfresco.share.version>
+        <alfresco.share.version>5.2.a-EA</alfresco.share.version>

        <!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
-        <alfresco.surf.version>6.5</alfresco.surf.version>
+        <alfresco.surf.version>6.6</alfresco.surf.version>

        <!-- Aikau framework version, it is released separately, so it can be useful to be able
             to bring in newer versions with bug fixes etc -->
-        <aikau.version>1.0.82</aikau.version>
+        <aikau.version>1.0.85</aikau.version>

        <!-- Since alfresco.war (i.e. the Platform/Repository) is already running on port 8080, we run Share.WAR on port 8081.
            If Alfresco Platform is not running, then generate a platform-jar-module and start it up. -->
@@ -36,6 +37,10 @@

        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
        <jrebel.version>1.1.6</jrebel.version>
+
+        <!-- Compile with Java 7, default is 5 -->
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
    </properties>

    <dependencies>
@@ -81,16 +86,22 @@
                    <!--
                       JARs and AMPs that should be overlayed/applied to the Share WAR
                       (i.e. share.war)
-                       No need to include our self...
                   -->
                    <shareModules>
                        <moduleDependency>
-                            <!-- Bring in a newer version, can coexist with older versions in the WAR disttribution,
-                                 newest version is picked. -->
+                            <!-- Bring in a newer version of Aikau, can coexist with older versions in the
+                                 WAR distribution, newest version is picked. -->
                            <groupId>${alfresco.groupId}</groupId>
                            <artifactId>aikau</artifactId>
                            <version>${aikau.version}</version>
                        </moduleDependency>
+                        <!-- Bring in this JAR project, need to be included here, otherwise share-config-custom.xml
+                             will not be picked up. It will not be read from target/classes/META-INF -->
+                        <moduleDependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <version>${project.version}</version>
+                        </moduleDependency>
                    </shareModules>
                </configuration>
            </plugin>
@@ -136,16 +147,63 @@
                    </execution>
                </executions>
                <configuration>
-                    <!--
-                      addResourcesDirToRebelXml - default is false
-                      Required if the resource directories are to be added to rebel.xml
-                    -->
-                    <addResourcesDirToRebelXml>true</addResourcesDirToRebelXml>
+                    <!-- For more information about how to configure JRebel plugin see:
+                         http://manuals.zeroturnaround.com/jrebel/standalone/maven.html#maven-rebel-xml -->
+                    <classpath>
+                        <fallback>all</fallback>
+                        <resources>
+                            <resource>
+                                <!--
+                                Empty resource element marks default configuration. By
+                                default it is placed first in generated configuration.
+                                -->
+                            </resource>
+                        </resources>
+                    </classpath>

-                    <!-- Always generate the rebel.xml file no matter what timestamps -->
+                    <!--
+                      alwaysGenerate - default is false
+                      If 'false' - rebel.xml is generated if timestamps of pom.xml and the current rebel.xml file are not equal.
+                      If 'true' - rebel.xml will always be generated
+                    -->
                    <alwaysGenerate>true</alwaysGenerate>
                </configuration>
            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <nonFilteredFileExtensions> <!-- jpg, jpeg, gif, bmp and png are added automatically -->
+                        <nonFilteredFileExtension>ftl</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>acp</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>
+                        <nonFilteredFileExtension>css</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ico</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>psd</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>js</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
        </plugins>

        <resources>
@@ -180,6 +238,11 @@
                <updatePolicy>daily</updatePolicy>
            </snapshots>
        </repository>
+        <!-- Alfresco Enterprise Edition Artifacts, put username/pwd for server in settings.xml -->
+        <repository>
+            <id>alfresco-private-repository</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+        </repository>
    </repositories>
    <pluginRepositories>
        <pluginRepository>
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat
@@ -6,4 +6,4 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@echo off

-mvn clean install -DskipTests=true alfresco:run
+mvn clean install alfresco:run
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 # Note. requires Alfresco.war to be running in another Tomcat on port 8080

-mvn clean install -DskipTests=true alfresco:run
+mvn clean install alfresco:run
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml
@@ -10,13 +10,41 @@
    </formats>

    <includeBaseDirectory>false</includeBaseDirectory>
+
    <files>
+        <!-- Filter module.properties and put at top level in the AMP -->
        <file>
-            <source>${project.basedir}/src/main/resources/alfresco/module/${project.artifactId}/module.properties</source>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/module.properties</source>
            <filtered>true</filtered>
        </file>
+        <!-- Include AMP -> WAR mapping file (needed for custom mappings) -->
+        <file>
+            <source>src/main/assembly/file-mapping.properties</source>
+            <filtered>false</filtered>
+        </file>
    </files>

+    <fileSets>
+        <!-- Anything in the assembly/lib directory will end up in the /lib directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/lib</directory>
+            <outputDirectory>lib</outputDirectory>
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Anything in the assembly/web directory will end up in the /web directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/web</directory>
+            <outputDirectory>web</outputDirectory>
+            <filtered>true</filtered> <!-- Will filter files and substitute POM props such as for example ${project.name} -->
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+    <!-- Include the project artifact (JAR) in the /lib directory in the AMP -->
    <dependencySets>
        <dependencySet>
            <outputDirectory>lib</outputDirectory>
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/file-mapping.properties
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/file-mapping.properties
@@ -0,0 +1,27 @@
+# Custom AMP to WAR location mappings
+
+#
+# The following property can be used to include the standard set of mappings.
+# The contents of this file will override any defaults.  The default is
+# 'true', i.e. the default mappings will be augmented or modified by values in
+# this file.
+#
+# Default mappings are:
+#
+# /config=/WEB-INF/classes
+# /lib=/WEB-INF/lib
+# /licenses=/WEB-INF/licenses
+# /web/jsp=/jsp
+# /web/css=/css
+# /web/images=/images
+# /web/scripts=/scripts
+# /web/php=/php
+#
+include.default=true
+
+#
+# Custom mappings.  If 'include.default' is false, then this is the complete set.
+# Map /web to / in AMP so we can override things like favicon.ico
+#
+/web=/
+
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/lib/README.md
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/lib/README.md
@@ -0,0 +1,19 @@
+# 3rd party libraries (JARs) that should be included in WAR
+
+Put here any 3rd party libraries (JARs) that are needed by customizations, 
+but that are not part of the out-of-the-box libraries in the *share/WEB-INF/lib* 
+directory. 
+
+**Note**. Module dependency needs to be set to amp for the libs to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-share-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+  
+**Important**. If you need to use a library that is available out-of-the-box, then
+               include it as a *provided* dependency in the module.
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/web/README.md
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/web/README.md
@@ -0,0 +1,22 @@
+# Web resources that should override out-of-the-box files
+
+Put here any web resources that should override out-of-the-box
+web resources, such as favicon.ico. They will then end up in the 
+*/web* directory in the AMP, and applied to the WAR, and override
+any existing web resources in the Share.WAR.
+
+**Note**. Module dependency needs to be set to amp for the web resources to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-share-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+   
+**Important**. New web resources should not be located here, but instead 
+               in the usual place in the *src/main/resources/META-INF/resources/<module-id>/* directory.
+  
+ 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
alfresco-build	07543c68d3	[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.0-beta-5	2016-10-05 09:51:19 +01:00
Martin Bergljung	a07219e6e6	Support for custom webapps and sysprops, #412,#413	2016-10-03 12:05:39 +01:00
Martin Bergljung	4e26291761	Merge branch 'sdk-3.0' of https://github.com/Alfresco/alfresco-sdk into sdk-3.0	2016-09-30 12:10:54 +01:00
Martin Bergljung	c2ac314930	Initial check-in of Activiti JAR module, #410 , #415	2016-09-30 12:10:35 +01:00
alfresco-build	08acf1f433	[maven-release-plugin] prepare for next development iteration	2016-09-23 10:02:48 +01:00
alfresco-build	b9331c365f	[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.0-beta-4	2016-09-23 10:02:44 +01:00
Ole Hejlskov	63bd9a63c0	Remove sources and javadoc plugin. This is already handled by the release plugin	2016-09-23 10:56:47 +02:00
alfresco-build	f1dbb608d9	[maven-release-plugin] prepare for next development iteration	2016-09-23 09:40:38 +01:00
alfresco-build	657d16b91c	[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.0-beta-4	2016-09-23 09:40:34 +01:00
alfresco-build	7739556c94	[maven-release-plugin] prepare for next development iteration	2016-09-23 09:14:01 +01:00
alfresco-build	d7b0805cef	[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.0-beta-4	2016-09-23 09:13:57 +01:00
Martin Bergljung	0b8db99cd8	Added debug.* scripts	2016-09-19 14:45:25 +01:00
Martin Bergljung	eba635c8f8	All logging controlled by src/test/resources/alfresco/extension/dev-log4j.properties, #392	2016-09-19 14:13:36 +01:00
Martin Bergljung	2782f30a42	Improved support for using different databases, #400	2016-09-16 17:53:08 +01:00
Samuel Langlois	a32a537206	internal-release profile allows publishing release in our Nexus repo	2016-09-15 17:01:08 +01:00
Martin Bergljung	49160034cf	Upgraded to Community release 201609 EA and added API Explorer app to AIO and Platform module, #402	2016-09-15 14:08:03 +01:00
Martin Bergljung	50dac567c2	Added filtering of web resources added to AMP, #409	2016-09-15 12:58:08 +01:00
Martin Bergljung	9a7630acfb	Added excludes for resource filtering, so we don't filter for example FTL, #407	2016-09-15 11:33:37 +01:00
Martin Bergljung	be11344137	Switched to props config for compiler plugin, #404	2016-09-14 10:14:19 +01:00
Martin Bergljung	db9d7d637c	Add compiler plugin and set Java 7, #404	2016-09-14 09:12:34 +01:00
Martin Bergljung	04fe0678d7	Support for MySQL, PostgreSQL, and custom Tomcat dependencies, #400	2016-09-12 16:57:02 +01:00
Martin Bergljung	b46f173fb4	Added WAR artifact id property to platform jar project, #403	2016-09-12 14:09:05 +01:00
Martin Bergljung	d69f7e4937	Added private/enterprise repo to POMs, #394	2016-09-12 11:31:23 +01:00
Martin Bergljung	788347a5dd	Support for overriding out-of-the-box web resources and including 3rd party libs, #389	2016-09-07 11:28:40 +01:00
Martin Bergljung	d6f11dd977	Added license directory placeholders	2016-09-06 09:50:39 +01:00
Martin Bergljung	f0955cff98	Changed where Enterprise license should be located, #395	2016-09-06 09:19:34 +01:00
Martin Bergljung	05b2cfbb1e	Fix so JAR project files are not duplicated in WAR, #391	2016-09-05 15:23:53 +01:00
alfresco-build	558d4b422c	[maven-release-plugin] prepare for next development iteration	2016-09-05 14:35:29 +01:00
alfresco-build	d040ceb60d	[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.0-beta-3	2016-09-05 14:35:25 +01:00
alfresco-build	a8db2ddde0	[maven-release-plugin] prepare for next development iteration	2016-09-05 14:25:15 +01:00
alfresco-build	c9d1878cb9	[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.0-beta-3	2016-09-05 14:25:02 +01:00
Martin Bergljung	99c0a14220	Fix loading from META-INF in JAR, such as share-config-custom.xml, fix loading of resources such as /alfresco/test.html, #388	2016-08-26 09:12:17 +01:00
alfresco-build	6a1b09c102	[maven-release-plugin] prepare for next development iteration	2016-08-25 18:56:03 +01:00
				`@@ -0,0 +1 @@`
				`verify alfresco:run -Dmaven.tomcat.fork=true`
				`@@ -1 +0,0 @@`
				`verify -Prun -Penterprise -Dmaven.tomcat.fork=true`
				`@@ -1 +0,0 @@`
				`verify -Pamp-to-war -Penterprise -Dmaven.tomcat.fork=true`