[maven-release-plugin] prepare release alfresco-sdk-aggregator-3.0.1

This also raises questions around the use of <alfresco.platform.war.artifactId />
since this will never have any effect currently

.gitignore

@@ -12,3 +12,4 @@ pom.xml.next
 release.properties
 **.settings
 **bin
+*.DS_Store

ISSUE_TEMPLATE.md

@@ -0,0 +1,67 @@
+<!--
+
+If you are reporting a new issue, make sure that we do not have any duplicates
+already open. You can ensure this by searching the issue list for this
+repository. If there is a duplicate, please close your issue and add a comment
+to the existing issue instead.
+
+If you suspect your issue is a bug, please edit your issue description to
+include the BUG REPORT INFORMATION shown below. If you fail to provide this
+information within 7 days, we cannot debug your issue and will close it. We
+will, however, reopen it if you later provide the information.
+
+---------------------------------------------------
+GENERAL SUPPORT INFORMATION
+---------------------------------------------------
+
+The GitHub issue tracker is for bug reports and feature requests.
+General support can be found at the following locations:
+
+- Alfresco Community - https://community.alfresco.com/community/ecm
+- Post a question on StackOverflow, using the Alfresco tag
+
+-->
+
+
+## I'm submitting a ...   (check one with "x")
+```
+[ ] bug report => search github for a similar issue or PR before submitting
+[ ] feature request
+```
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+5.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Alfresco SDK version used: <!-- 2.1 / 2.2 / 3.0betaX-->
+* Alfresco version used: <!-- Enterprise 5.1, Community 5.0.f or ...-->
+* Output of command 'mvn -version': <!-- Maven/JDK version--> 
+* Link to your project: <!-- optional for having a minimal example-->
+
+## Additional information
+<!-- include screenshots or any other hint you mave have for us -->

README.md

@@ -1,42 +1,38 @@
 # [![Alfresco SDK logo](https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg)](#features) Alfresco SDK
 
-This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to build extensions for the Alfresco content management system. It is based on [Apache Maven](http://maven.apache.org/), compatible with major IDEs and enables Rapid Application Development (RAD) and Test Driven Development (TDD).
+This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to build extensions for the Alfresco Digital Business Platform. It is based on [Apache Maven](http://maven.apache.org/), compatible with major IDEs and enables Rapid Application Development (RAD) and Test Driven Development (TDD).
 
 ## License
 This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section.
 
 ## 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)
-- 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)  
+- 2017-03-27: After years of hard work, countless iterations and gathering feedback, SDK 3.0 has finally been merged into the master branch, ready for release in the coming days
+- 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).
 
 ## 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/).
 
-### 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).
 
-### Want to get up to speed quickly in Eclipse? Check out this video!
-
-[![Alfresco SDK 2.1 howto](http://img.youtube.com/vi/utYZaVe9Nd0/0.jpg)](https://www.youtube.com/watch?v=utYZaVe9Nd0)
 
 ## Reporting Issues and Community Support
-Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open). You can also join the [Alfresco list on Google Groups](https://groups.google.com/forum/#!forum/maven-alfresco) or join us on the [IRC Channel](http://chat.alfresco.com/). 
+Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open) or join us on the [IRC Channel](http://chat.alfresco.com/).
 
 ## Alfresco Enterprise Customers and Partners Support
 If you are an Alfresco Customer please check the [SDK Support status](http://www.alfresco.com/services/subscription/technical-support/product-support-status) for the version you are using and the [Compatibily Matrix](http://docs.alfresco.com/community/concepts/alfresco-sdk-compatibility.html) for the SDK / Alfresco compatibility. If your version is in Limited or Full Support, you can raise issues via the [Support Portal](http://support.alfresco.com).

archetypes/.gitignore

@@ -0,0 +1 @@
+*.DS_Store

archetypes/activiti-jar-archetype/.gitignore

@@ -0,0 +1 @@
+*.DS_Store

archetypes/activiti-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>activiti-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 - 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>2.2.0</version>
+    <version>3.0.1</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,18 @@
                 <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>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>

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

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
+    
+  
+ 

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
+

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

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.3</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.12</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>

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

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

archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/java/tasks/service/HelloWorldServiceTask.java

@@ -1,6 +1,6 @@
-#set($symbol_pound='#')
-#set($symbol_dollar='$')
-#set($symbol_escape='\' )
+#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
@@ -17,27 +17,22 @@ 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}.demoamp;
+package ${package}.tasks.service;
 
-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 java.util.HashMap;
-import java.util.Map;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.JavaDelegate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * A demonstration Java controller for the Hello World Web Script.
+ * A sample service task Java implementation
  *
  * @author martin.bergljung@alfresco.com
- * @since 2.1.0
  */
-public class HelloWorldWebScript extends DeclarativeWebScript {
-    protected Map<String, Object> executeImpl(
-            WebScriptRequest req, Status status, Cache cache) {
-        Map<String, Object> model = new HashMap<String, Object>();
-        model.put("fromJava", "HelloFromJava");
-        return model;
+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!");
     }
 }

archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/Hello World.json

@@ -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": []
+}

archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.bpmn20.xml

@@ -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>

archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/bpmn-models/Hello World-2005.json

@@ -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": []
+}

archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/decision-table-models/Decide What Greeting-2007.json

@@ -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": []
+  }
+}

archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/src/main/resources/apps/helloworld/form-models/Hello World Start-2006.json

@@ -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
+  }
+}

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.
+   
+  
+ 

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

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

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

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

archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/archetype.properties

@@ -1,4 +1,5 @@
 version=0.1-SNAPSHOT
 groupId=archetype.it
-artifactId=repoAmpTestRunEnterprise
+artifactId=activitiJARTest
 package=it.pkg
+

archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/goal.txt

@@ -0,0 +1 @@
+verify -Dmaven.test.skip=true

archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/archetype.properties

@@ -0,0 +1,4 @@
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=activitiJARTestRun
+package=it.pkg

archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/goal.txt

@@ -0,0 +1 @@
+install

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>2.2.0</version>
+    <version>3.0.1</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,8 @@
 
      <plugins>
         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>2.7</version>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>

archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -1,7 +1,7 @@
 <?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="All In One Archetype for Alfresco. Provides rapid development, IDE integration, and running embedded of Alfresco Repo, Share and Solr"
+        name="Alfresco All In One (AIO) 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>
@@ -10,8 +10,16 @@
         </requiredProperty>
     </requiredProperties>
     <modules>
-        <module id="${rootArtifactId}-repo-amp" name="${rootArtifactId}-repo-amp" dir="__rootArtifactId__-repo-amp">
+        <module id="${rootArtifactId}-platform-jar"
+                name="${rootArtifactId}-platform-jar"
+                dir="__rootArtifactId__-platform-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>
@@ -25,7 +33,7 @@
                     </includes>
                 </fileSet>
                 <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/main/amp</directory>
+                    <directory>src/main/resources</directory>
                     <includes>
                         <include>**</include>
                     </includes>
@@ -34,16 +42,89 @@
                     </excludes>
                 </fileSet>
                 <fileSet encoding="UTF-8" filtered="true" packaged="false">
-                    <directory>src/main/amp</directory>
+                    <directory>src/main/resources</directory>
                     <includes>
                         <include>**/*-context.xml</include>
                     </includes>
                 </fileSet>
+            </fileSets>
+        </module>
+
+        <module id="${rootArtifactId}-share-jar"
+                name="${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>
+                        <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 filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/main/resources/alfresco/web-extension</directory>
+                    <includes>
+                        <include>__artifactId__-slingshot-application-context.xml</include>
+                    </includes>
+                </fileSet>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/main/resources/alfresco/web-extension/site-data/extensions</directory>
+                    <includes>
+                        <include>__artifactId__-example-widgets.xml</include>
+                    </includes>
+                </fileSet>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>src/main/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/__artifactId__-slingshot-application-context.xml</exclude>
+                        <exclude>**/__artifactId__-example-widgets.xml</exclude>
+                    </excludes>
+                </fileSet>
+            </fileSets>
+        </module>
+
+        <module id="integration-tests" name="integration-tests" dir="integration-tests">
+            <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/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>
@@ -53,134 +134,51 @@
                 </fileSet>
             </fileSets>
         </module>
-
-        <module id="${rootArtifactId}-share-amp" name="${rootArtifactId}-share-amp" dir="__rootArtifactId__-share-amp" >
-            <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 filtered="true" packaged="false" encoding="UTF-8">
-                    <directory>src/main/amp/config/alfresco/web-extension</directory>
-                    <includes>
-                        <include>__artifactId__-slingshot-application-context.xml</include>
-                    </includes>
-                </fileSet>
-                <fileSet filtered="true" packaged="false" encoding="UTF-8">
-                    <directory>src/main/amp/config/alfresco/web-extension/site-data/extensions</directory>
-                    <includes>
-                        <include>__artifactId__-example-widgets.xml</include>
-                    </includes>
-                </fileSet>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/main/amp</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/__artifactId__-slingshot-application-context.xml</exclude>
-                        <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>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/main/resources</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
-            </fileSets>
-        </module>
-
-        <module id="repo" dir="repo" name="repo">
-            <fileSets>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/main/properties</directory>
-                    <includes>
-                        <include>**/*.properties</include>
-                    </includes>
-                </fileSet>
-                <fileSet encoding="UTF-8" filtered="true">
-                    <directory>src/main/resources/alfresco/extension</directory>
-                    <includes>
-                        <include>dev-log4j.properties</include>
-                    </includes>
-                </fileSet>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/main/resources</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/dev-log4j.properties</exclude>
-                    </excludes>
-                </fileSet>
-            </fileSets>
-        </module>
-
-        <module id="solr4" dir="solr-config" name="solr4" filtered="false">
-        </module>
-
-        <module id="share" dir="share" name="share" filtered="false">
-            <fileSets>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/main/resources</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
-                <fileSet filtered="true" packaged="false" encoding="UTF-8">
-                    <directory>src/test/resources</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
-            </fileSets>
-        </module>
-
-        <module id="runner" dir="runner" name="runner" filtered="false">
-            <fileSets>
-                <fileSet encoding="UTF-8" filtered="true">
-                    <directory>tomcat</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>test-ng</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/main/webapp</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
-            </fileSets>
-        </module>
     </modules>
 
     <fileSets>
+        <fileSet encoding="UTF-8" filtered="true">
+            <directory>src/test/resources</directory>
+            <includes>
+                <include>**/dev-log4j.properties</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="true">
+            <directory>src/test/resources</directory>
+            <includes>
+                <include>*hotswap-agent.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>
+                <exclude>*hotswap-agent.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>
             </includes>
         </fileSet>
     </fileSets>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md

@@ -0,0 +1,34 @@
+# Alfresco AIO Project - SDK 3
+
+This is an All-In-One (AIO) project for Alfresco SDK 3.0. 
+
+Run with `mvn clean install -DskipTests=true alfresco:run` or `./run.sh` and verify that it 
+
+ * Runs the embedded Tomcat + H2 DB 
+ * Runs Alfresco Platform (Repository)
+ * Runs Alfresco Solr4
+ * Runs Alfresco Share
+ * Packages both as JAR and AMP assembly for modules
+ 
+# Few things to notice
+
+ * No parent pom
+ * No WAR projects, all handled by the Alfresco Maven Plugin 
+ * No runner project - it's all in the Alfresco Maven Plugin
+ * 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`
+ * AMP as an assembly
+ * [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
+ * Resources loaded from META-INF
+ * Web Fragment (this includes a sample servlet configured via web fragment)
+ 
+# TODO
+ 
+  * Abstract assembly into a dependency so we don't have to ship the assembly in the archetype
+  * Purge
+  * Functional/remote unit tests
+   
+  
+ 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/pom.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>${artifactId}</artifactId>
+    <name>Alfresco Platform/Repository JAR Module</name>
+    <description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 3
+    </description>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>${groupId}</groupId>
+        <artifactId>${rootArtifactId}</artifactId>
+        <version>${version}</version>
+    </parent>
+
+    <properties>
+    </properties>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/amp.xml

@@ -0,0 +1,61 @@
+<assembly
+    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+
+    <!--
+    Note that the Module dependency specified in the configuration section for the Alfresco Maven Plugin
+    needs to be set to amp if any 3rd party libs should be applied by MMT:
+`
+    <platformModules>
+        <moduleDependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>some-platform-jar</artifactId>
+            <version>${project.version}</version>
+            <type>amp</type>
+        </moduleDependency>
+    -->
+
+    <id>build-amp-file</id>
+
+    <formats>
+        <format>amp</format>
+    </formats>
+
+    <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/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, and any 3rd party libraries (JARs)
+         used by the customization.
+    -->
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+
+</assembly>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/file-mapping.properties

@@ -1,14 +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.
-#
-include.default=true
-
-#
-# Custom mappings.  If 'include.default' is false, then this is the complete set.
-#
-/web=/
+# 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=/
+

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.
+  
+ 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/java/platformsample/Demo.java

@@ -0,0 +1,35 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+/**
+ * Copyright (C) 2017 Alfresco Software Limited.
+ * <p/>
+ * This file is part of the Alfresco SDK project.
+ * <p/>
+ * Licensed 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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}.platformsample;
+
+/**
+ * This class does nothing except dump some output to <i>system.out</i>.
+ * This is a sample taken from Maven Alfresco SDK
+ * 
+ * @author Derek Hulley
+ */
+public class Demo
+{
+	public void init()
+	{
+		System.out.println("Platform JAR Module class has been loaded");
+	}
+}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/java/platformsample/DemoComponent.java

@@ -1,23 +1,24 @@
 #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}.demoamp;
+/**
+ * Copyright (C) 2017 Alfresco Software Limited.
+ * <p/>
+ * This file is part of the Alfresco SDK project.
+ * <p/>
+ * Licensed 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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}.platformsample;
 
 import org.alfresco.repo.module.AbstractModuleComponent;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
@@ -35,7 +36,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 +56,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 AMP 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 purposes. Better remove me from the log in Production");
     }
 
     /**

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/java/platformsample/HelloWorldWebScript.java

@@ -0,0 +1,51 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/**
+ * Copyright (C) 2017 Alfresco Software Limited.
+ * <p/>
+ * This file is part of the Alfresco SDK project.
+ * <p/>
+ * Licensed 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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}.platformsample;
+
+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;
+
+/**
+ * A demonstration Java controller for the Hello World Web Script.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @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;
+    }
+}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/META-INF/resources/test.html

@@ -0,0 +1 @@
+Test 123

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.desc.xml

@@ -4,4 +4,5 @@
     <url>/sample/helloworld</url>
     <authentication>user</authentication>
     <format default="html"></format>
+    <lifecycle>sample</lifecycle>    
 </webscript>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.html.ftl

@@ -0,0 +1 @@
+Message: '${fromJS}' '${fromJava}'

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.js

@@ -0,0 +1 @@
+model["fromJS"] = "Hello from JS!";

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/alfresco-global.properties

@@ -1,5 +1,5 @@
-## This Alfresco Repo Configuration file should be used for custom properties that are introduced by this module.
+## This Alfresco Platform Configuration file should be used for custom properties that are introduced by this module.
 ## Define default values for all properties here.
 ## System Administrators can override these values in environment specific configurations in
 ## alfresco/tomcat/shared/classes/alfresco-global.properties.
-##
+## 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml

@@ -5,23 +5,36 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-          http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
     <!-- The bootstrap-context.xml file is used for patch definitions, importers, 
 		 workflow, and loading custom content models.  -->
 
-
     <!-- Registration of new models -->
     <bean id="${artifactId}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
         <property name="models">
             <list>
                 <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>
                 <value>alfresco/module/${project.artifactId}/model/workflow-model.xml</value>
-
+            </list>
+        </property>
+        <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">
+        <property name="workflowDefinitions">
+            <list>
+                <props>
+                    <prop key="engineId">activiti</prop>
+                    <prop key="location">alfresco/module/${project.artifactId}/workflow/sample-process.bpmn20.xml</prop>
+                    <prop key="mimetype">text/xml</prop>
+                </props>
+            </list>
+        </property>
+    </bean>
 </beans>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml

@@ -2,7 +2,6 @@
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -10,32 +9,36 @@
     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.
 -->
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
     <!-- A simple class that is initialized by Spring -->
-    <bean id="${artifactId}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />
+    <bean id="${package}.Demo" 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 -Pamp-to-war twice will only execute this component the first time.
-        You need to remove /alf_data_dev for it to be executed again. -->
-    <bean id="${artifactId}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
-        <property name="moduleId" value="${project.artifactId}" />  <!-- See module.properties -->
-        <property name="name" value="exampleComponent" />
+         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}.DemoComponent" class="${package}.platformsample.DemoComponent" parent="module.baseComponent" >
+        <property name="moduleId" value="${artifactId}" />  <!-- See module.properties -->
+        <property name="name" value="DemoComponent" />
         <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>
 
+
 </beans>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/webscript-context.xml

@@ -2,7 +2,6 @@
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 <!--
 	Licensed to the Apache Software Foundation (ASF) under one or more
 	contributor license agreements.  See the NOTICE file distributed with
@@ -19,9 +18,12 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 -->
-<beans>
-	<bean id="webscript.helloworld.get"
-		  class="${package}.demoamp.HelloWorldWebScript"
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	<bean id="webscript.alfresco.tutorials.helloworld.get"
+		  class="${package}.platformsample.HelloWorldWebScript"
 		  parent="webscript">
 	</bean>
 </beans>

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

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/model/content-model.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="acme:contentModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+    <!-- Optional meta-data about the model -->
+    <description>Sample Document Model</description>
+    <author>My Name</author>
+    <version>1.0</version>
+
+    <imports>
+        <!-- Import Alfresco Dictionary Definitions -->
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <!-- Import Alfresco Content Domain Model Definitions -->
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+        <!-- Import Alfresco System Model Definitions -->
+        <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
+    </imports>
+
+    <!-- Custom namespace for the ACME company -->
+    <namespaces>
+        <namespace uri="http://www.acme.org/model/content/1.0" prefix="acme"/>
+    </namespaces>
+
+    <constraints>
+        <constraint name="acme:securityClassificationOptions" type="LIST">
+            <parameter name="allowedValues">
+                <list>
+                    <value></value>
+                    <!-- Empty for default search-->
+                    <value>Public</value>
+                    <value>Client Confidential</value>
+                    <value>Company Confidential</value>
+                    <value>Strictly Confidential</value>
+                </list>
+            </parameter>
+        </constraint>
+    </constraints>
+
+    <!-- ===============================================================================================================
+        Constraints, Types, and Aspects go here...
+        -->
+
+    <types>
+        <!--
+            ACME Enterprise-wide Document root type.
+            All other custom document types would extend this one.
+        -->
+        <type name="acme:document">
+            <title>Sample Document Type</title>
+            <parent>cm:content</parent>
+            <properties>
+                <property name="acme:documentId">
+                    <title>Document Identification Number</title>
+                    <type>d:text</type>
+                </property>
+            </properties>
+            <mandatory-aspects>
+                <aspect>acme:securityClassified</aspect>
+            </mandatory-aspects>
+        </type>
+    </types>
+
+    <aspects>
+        <!-- A document can have security classification applied and
+             faceted search is specifically enabled for best performance and we change
+             default index config to not tokenize the value. -->
+        <aspect name="acme:securityClassified">
+            <title>ACME Security Classified</title>
+            <description>Content has been security classified</description>
+            <properties>
+                <property name="acme:securityClassification">
+                    <type>d:text</type>
+                    <index enabled="true">
+                        <atomic>true</atomic>
+                        <stored>false</stored>
+                        <tokenised>false</tokenised>
+                    </index>
+                    <constraints>
+                        <constraint ref="acme:securityClassificationOptions"/>
+                    </constraints>
+                </property>
+            </properties>
+        </aspect>
+    </aspects>
+
+</model>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/model/workflow-model.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model name="myw:workflowModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+<model name="acmew:workflowModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
     <!-- Optional meta-data about the model -->
-    <description>Workflow Model for Repo Extension X</description>
+    <description>Sample Workflow Model</description>
     <author>My Name</author>
     <version>1.0</version>
 
@@ -16,7 +16,7 @@
 
     <!-- Custom namespace for your domain -->
     <namespaces>
-        <namespace uri="http://www.mycompany.com/model/workflow/1.0" prefix="myw"/>
+        <namespace uri="http://www.acme.org/model/workflow/1.0" prefix="acmew"/>
     </namespaces>
 
     <!-- ===============================================================================================================

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module-context.xml

@@ -15,9 +15,12 @@
 	limitations under the License.
 	
 -->
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
 	<!-- This is filtered by Maven at build time, so that module name is single sourced. -->
 	<!-- Note. The bootstrap-context.xml file has to be loaded first.
 				Otherwise your custom models are not yet loaded when your service beans are instantiated and you

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml

@@ -0,0 +1,21 @@
+<?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: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/test">
+
+   <process id="my-process">
+
+      <startEvent id="start" />
+      <sequenceFlow id="flow1" sourceRef="start" targetRef="someTask" />
+      
+      <userTask id="someTask" name="Activiti is awesome!" />
+      <sequenceFlow id="flow2" sourceRef="someTask" targetRef="end" />
+
+      <endEvent id="end" />
+
+   </process>
+
+</definitions>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/test/java/platformsample/HelloWorldWebScriptControllerTest.java

@@ -0,0 +1,56 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/**
+ * Copyright (C) 2017 Alfresco Software Limited.
+ * <p/>
+ * This file is part of the Alfresco SDK project.
+ * <p/>
+ * Licensed 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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}.platformsample;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.extensions.webscripts.*;
+
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Unit testing the Web Script Java Controller
+ *
+ * @author martin.bergljung@alfresco.com
+ * @version 1.0
+ * @since 3.0
+ */
+public class HelloWorldWebScriptControllerTest {
+
+    @Test
+    public void testController() {
+        WebScriptRequest req = Mockito.mock(WebScriptRequest.class);
+        Status status = Mockito.mock(Status.class);
+        Cache cache = Mockito.mock(Cache.class);
+
+        String helloPropName = "fromJava";
+        String helloPropExpectedValue = "HelloFromJava";
+        HelloWorldWebScript ws = new HelloWorldWebScript();
+        Map<String, Object> model = ws.executeImpl(req, status, cache);
+
+        assertNotNull("Response from Web Script Java Controller is null", model);
+        assertEquals("Incorrect Web Script Java Controller Response",
+                helloPropExpectedValue, model.get(helloPropName));
+    }
+}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/pom.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>${artifactId}</artifactId>
-    <name>Alfresco Repository AMP Module</name>
-    <packaging>amp</packaging>
-    <description>This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR aggregator</description>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
-        <version>${version}</version>
-    </parent>
-    
-    <properties>
-        <!-- Property overrides are mostly done in parent pom -->
-    </properties>
-
-    <!-- Following dependencies are needed for compiling Java code in src/main/java;
-          <scope>provided</scope> is inherited for each of the following;
-          for more info, please refer to alfresco-platform-distribution POM -->
-    <dependencies>
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-repository</artifactId>
-        </dependency>
-
-        <!-- Uncomment if you are using RM (Records Management) module, brings in RM related classes -->
-        <!--
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-rm</artifactId>
-            <version>${alfresco.rm.version}</version>
-            <classifier>classes</classifier>
-        </dependency>
-        -->
-    </dependencies>
-
-    <profiles>
-
-        <!--
-            Brings in the extra Enterprise specific repository classes,
-            if the 'enterprise' profile has been activated, needs to be activated manually. -->
-        <profile>
-            <id>enterprise</id>
-            <dependencies>
-                <dependency>
-                    <groupId>${alfresco.groupId}</groupId>
-                    <artifactId>alfresco-enterprise-repository</artifactId>
-                    <version>${alfresco.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- If we are running in embedded Tomcat skip unit tests -->
-        <profile>
-            <id>run</id>
-            <properties>
-                <skipTests>true</skipTests>
-            </properties>
-        </profile>
-    </profiles>
-</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl

@@ -1 +0,0 @@
-Message: ${fromJS} ${fromJava}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js

@@ -1 +0,0 @@
-model["fromJS"] = "Hello World from JS!";

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model name="myc:contentModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
-
-    <!-- Optional meta-data about the model -->
-    <description>Document Model for Repo Extension X</description>
-    <author>My Name</author>
-    <version>1.0</version>
-
-    <imports>
-        <!-- Import Alfresco Dictionary Definitions -->
-        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
-        <!-- Import Alfresco Content Domain Model Definitions -->
-        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
-        <!-- Import Alfresco System Model Definitions -->
-        <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
-    </imports>
-
-    <!-- Custom namespace for your domain -->
-    <namespaces>
-        <namespace uri="http://www.mycompany.com/model/content/1.0" prefix="myc"/>
-    </namespaces>
-
-    <!-- ===============================================================================================================
-        Constraints, Types, and Aspects go here...
-        -->
-
-</model>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/css/demoamp.css

@@ -1,16 +0,0 @@
-/*
-    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.
- */

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/jsp/demoamp.jsp

@@ -1,17 +0,0 @@
-<!-- 
-    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.
- -->
- Test jsp. Change me! 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/licenses/README-licenses.txt

@@ -1,2 +0,0 @@
-This folder (root in the AMP) gets mapped automagically in WEB-INF/licenses
-in the war build

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/scripts/demoamp.js

@@ -1,16 +0,0 @@
-/*
-    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.
- */

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/java/demoamp/test/DemoComponentTest.java

@@ -1,86 +0,0 @@
-#set($symbol_pound='#')
-#set($symbol_dollar='$')
-#set($symbol_escape='\' )
-package ${package}.demoamp.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import ${package}.demoamp.DemoComponent;
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.apache.log4j.Logger;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.tradeshift.test.remote.Remote;
-import com.tradeshift.test.remote.RemoteTestRunner;
-
-/**
- * A simple class demonstrating how to run out-of-container tests 
- * loading Alfresco application context.
- * 
- * This class uses the RemoteTestRunner to try and connect to 
- * localhost:4578 and send the test name and method to be executed on 
- * a running Alfresco. One or more hostnames can be configured in the @Remote
- * annotation.
- * 
- * If there is no available remote server to run the test, it falls 
- * back on local running of JUnits.
- * 
- * For proper functioning the test class file must match exactly 
- * the one deployed in the webapp (either via JRebel or static deployment)
- * otherwise "incompatible magic value XXXXX" class error loading issues will arise.  
- * 
- * @author Gabriele Columbro 
- * @author Maurizio Pillitu
- *
- */
-@RunWith(RemoteTestRunner.class)
-@Remote(runnerClass=SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:alfresco/application-context.xml")
-public class DemoComponentTest {
-    
-    private static final String ADMIN_USER_NAME = "admin";
-
-    static Logger log = Logger.getLogger(DemoComponentTest.class);
-
-    @Autowired
-    protected DemoComponent demoComponent;
-    
-    @Autowired
-    @Qualifier("NodeService")
-    protected NodeService nodeService;
-    
-    @Test
-    public void testWiring() {
-        assertNotNull(demoComponent);
-    }
-    
-    @Test
-    public void testGetCompanyHome() {
-    	AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER_NAME);
-        NodeRef companyHome = demoComponent.getCompanyHome();
-        assertNotNull(companyHome);
-        String companyHomeName = (String) nodeService.getProperty(companyHome, ContentModel.PROP_NAME);
-        assertNotNull(companyHomeName);
-        assertEquals("Company Home", companyHomeName);
-    }
-    
-    @Test
-    public void testChildNodesCount() {
-    	AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER_NAME);
-        NodeRef companyHome = demoComponent.getCompanyHome();
-        int childNodeCount = demoComponent.childNodesCount(companyHome);
-        assertNotNull(childNodeCount);
-        // There are 7 folders by default under Company Home
-        assertEquals(7, childNodeCount);
-    }
-
-}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/test-log4j.properties

@@ -1,23 +0,0 @@
-# Overrides only log4j locations and add the test logging properties
-# This gets merged with the main file 
-
-# Set root logger level to error
-log4j.rootLogger=${app.log.root.level}, Console, File
-
-###### Console appender definition #######
-
-# All outputs currently set to be a ConsoleAppender.
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-
-# use log4j NDC to replace %x with tenant domain / username
-log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
-#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-###### File appender definition #######
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=${app.log.dir}alfresco.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>${artifactId}</artifactId>
-    <name>Alfresco Share AMP Module</name>
-    <packaging>amp</packaging>
-    <description>This is a sample Alfresco Share AMP project, depended upon by the share WAR module</description>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
-        <version>${version}</version>
-    </parent>
-
-    <!-- 
-        SDK properties have sensible defaults in the SDK parent,
-        but you can override the properties below to use another version.
-        For more available properties see the alfresco-sdk-parent POM.
-       -->
-    <properties>
-        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
-             Allowed values: alfresco | share. In this case it's configured to use OOTB share -->
-        <app.amp.client.war.artifactId>share</app.amp.client.war.artifactId>
-
-        <!-- Defines the log level used in log4j.properties -->
-        <app.log.root.level>WARN</app.log.root.level>
-    </properties>
-
-    <!-- Following dependencies are needed for compiling Java code in src/main/java; 
-         <scope>provided</scope> is inherited for each of the following; 
-         for more info, please refer to alfresco-platform-distribution POM -->
-    <dependencies>
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>share</artifactId>
-            <version>${alfresco.version}</version>
-            <classifier>classes</classifier>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.extensions.surf</groupId>
-            <artifactId>spring-surf-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!--===============================================================
-             The following dependencies are needed to be able to compile the
-             custom functional tests that are based on Page Objects (PO)
-             ===============================================================-->
-
-        <!-- Bring in the Share Page Objects (PO) used in our functional tests.
-             It contains page objects such as LoginPage and it also brings
-             in selenium-grid and selenium. -->
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>share-po</artifactId>
-            <version>${alfresco.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Bring in the Share Page Object (PO) Tests that comes with Alfresco. It has
-             the org.alfresco.po.share.AbstractTest class that our custom tests extend. -->
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>share-po</artifactId>
-            <version>${alfresco.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-
-            <!-- Exclude selenium as it is already brought in by share-po dependency above -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.seleniumhq.selenium</groupId>
-                    <artifactId>selenium-java</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.seleniumhq.selenium</groupId>
-                    <artifactId>selenium-server</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Test NG is defined with test scope in share-po, so need it here too -->
-        <!-- Alfresco code creates a wrapper around Test NG -->
-        <dependency>
-            <groupId>org.alfresco.test</groupId>
-            <artifactId>alfresco-testng</artifactId>
-            <version>1.1</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties

@@ -1,9 +0,0 @@
-# This file should contain messages and labels specific to this share extension
-# Put here things like:
-#   Content Model Aspect and Type Labels
-#   Form field labels
-#   Doc lib Action labels and messages
-#   Doc Lib Action Forms labels
-#
-
-

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties

@@ -1,2 +0,0 @@
-hello-label=Hello from i18n!
-hello-test=New label!

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/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:
-             alfresco-allinone/share/src/main/resources/alfresco/web-extension/share-config-custom.xml file
-     -->
-<alfresco-config>
-
-
-</alfresco-config>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java

@@ -1,96 +0,0 @@
-#set($symbol_pound='#')
-#set($symbol_dollar='$')
-#set($symbol_escape='\' )
-/*
- * Copyright (C) 2005-2016 Alfresco Software Limited.
- * This file is part of Alfresco
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package ${package}.demoamp;
-
-import ${package}.demoamp.po.DemoPage;
-import org.alfresco.po.share.LoginPage;
-import org.alfresco.po.AbstractTest;
-import org.alfresco.po.share.PeopleFinderPage;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * Functional test that demonstrates how to write and
- * extend an alfresco share page object.
- * This test shows the interaction with page objects
- * brought from share-po project along with newly created ones
- * that are present in the Demo amp.
- *
- * @author Michael Suzuki
- * @since 2.0.1
- */
-public class DemoPageTestIT extends AbstractTest {
-    DemoPage page;
-
-    @BeforeClass(groups = {"alfresco-one"})
-    public void prepare() throws Exception {
-        // Navigate to share, which will redirect to Login page
-        driver.navigate().to(shareUrl + "/page");
-
-        // Resolve/Bind current page to LoginPage object
-        LoginPage loginPage = resolvePage(driver).render();
-        loginPage.loginAs(username, password);
-    }
-
-    @BeforeMethod
-    public void loadPage() {
-        // Goto demo page
-        driver.navigate().to(shareUrl + "/page/hdp/ws/simple-page");
-
-        // We need to instantiate the page like this as it is not yet in
-        // the factory known list of pages
-        page = factoryPage.instantiatePage(driver, DemoPage.class);
-    }
-
-    @Test
-    public void findLogo() {
-        Assert.assertTrue(page.isSimpleLogoDisplayed());
-    }
-
-    @Test
-    public void messageIsDisplayed() {
-        page.render();
-        String msg = page.getMessage();
-        Assert.assertNotNull(msg);
-        Assert.assertEquals("Hello from i18n!", msg);
-    }
-
-    /**
-     * Example of test reusing methods in abstract share page objects.
-     */
-    @Test
-    public void titleDisplayed() {
-        // Invoke render when ready to use page object.
-        page.render();
-        Assert.assertNotNull(page);
-        Assert.assertTrue(page.getTitle().contains("This is a simple page"));
-    }
-
-    /**
-     * Test that show how we are able to reuse share page objects
-     * objects in particular the navigation object.
-     */
-    @Test
-    public void navigate() {
-        Assert.assertNotNull(page.getNav());
-        PeopleFinderPage peopleFinderPage = page.getNav().selectPeople().render();
-        Assert.assertNotNull(peopleFinderPage);
-    }
-}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java

@@ -1,70 +0,0 @@
-#set($symbol_pound='#')
-#set($symbol_dollar='$')
-#set($symbol_escape='\' )
-/*
- * Copyright (C) 2005-2016 Alfresco Software Limited.
- * This file is part of Alfresco
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package ${package}.demoamp.po;
-
-import org.alfresco.po.share.SharePage;
-import org.alfresco.po.RenderTime;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-
-/**
- * Demo of simple share page object that encapsulates the demo of simple page.
- *
- * @author Michael Suzuki
- * @since 2.0.1
- */
-public class DemoPage extends SharePage {
-    @FindBy(id="DEMO_SIMPLE_LOGO")
-    WebElement logo;
-
-    @FindBy(id="DEMO_SIMPLE_MSG")
-    WebElement msg;
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public DemoPage render(RenderTime timer) {
-
-        // Wait for logo and message to display, then consider page rendered
-        while (true) {
-            timer.start();
-            try {
-                if (isSimpleLogoDisplayed() && isMessageDisplayed()) {
-                    break;
-                }
-            } catch (NoSuchElementException nse) {
-            } finally {
-                timer.end();
-            }
-        }
-
-        return this;
-    }
-
-    public boolean isSimpleLogoDisplayed() {
-        return isDisplayed(logo);
-    }
-
-    public boolean isMessageDisplayed() {
-        return isDisplayed(msg);
-    }
-
-    public String getMessage() {
-        return msg.getText();
-    }
-}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/resources/testng.xml

@@ -1,12 +0,0 @@
-#set($symbol_pound='#')
-#set($symbol_dollar='$')
-#set($symbol_escape='\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="Custom Share AMP Page Object Tests" parallel="false">
-    <test name="DemoPageTest">
-        <classes>
-            <class name="${package}.demoamp.DemoPageTestIT"/>
-        </classes>
-    </test>
-</suite>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>${artifactId}</artifactId>
+    <name>Alfresco Share JAR Module</name>
+    <packaging>jar</packaging>
+    <description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 3</description>
+
+    <parent>
+        <groupId>${groupId}</groupId>
+        <artifactId>${rootArtifactId}</artifactId>
+        <version>${version}</version>
+    </parent>
+
+    <properties>
+    </properties>
+
+    <!-- Following dependencies are needed for compiling Java code in src/main/java;
+         <scope>provided</scope> is inherited for each of the following;
+         for more info, please refer to alfresco-platform-distribution POM -->
+    <dependencies>
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>share</artifactId>
+            <classifier>classes</classifier>
+        </dependency>
+
+        <dependency>
+            <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>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/amp.xml

@@ -0,0 +1,61 @@
+<assembly
+    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+
+    <!--
+    Note that the Module dependency specified in the configuration section for the Alfresco Maven Plugin
+    needs to be set to amp if any 3rd party libs should be applied by MMT:
+    `
+    <shareModules>
+        <moduleDependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>some-share-jar</artifactId>
+            <version>${project.version}</version>
+            <type>amp</type>
+        </moduleDependency>
+    -->
+
+    <id>build-amp-file</id>
+
+    <formats>
+        <format>amp</format>
+    </formats>
+
+    <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/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, and any 3rd party libraries (JARs)
+         used by the customization.
+    -->
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+
+</assembly>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/file-mapping.properties

@@ -1,14 +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.
-#
-include.default=true
-
-#
-# Custom mappings.  If 'include.default' is false, then this is the complete set.
-#
-/web=/
+# 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=/
+

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.
+  
+ 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/css/TemplateWidget.css

@@ -2,4 +2,5 @@
     border: 1px #000000 solid;
     padding: 1em;
     width: 100px;
+    background-color: deepskyblue;
 }

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/i18n/TemplateWidget.properties

@@ -0,0 +1,3 @@
+hello-label=Hello from i18n
+
+

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>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml

@@ -0,0 +1,29 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+   
+   <!--
+    Define beans related to this Share extension here, such as
+     evaluators and resource bootstrapping.
+
+     Note. Any configuration related to the whole Share.war webapp
+           (i.e. not specific to this share extension) should be
+            placed in the alfresco-allinone/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml file
+   -->
+
+   <!-- Add module specific messages and labels -->
+   <bean id="${package}.${artifactId}.resources"
+         class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.web-extension.messages.${artifactId}</value>
+         </list>
+      </property>
+   </bean>
+
+</beans>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/messages/__artifactId__.properties

@@ -0,0 +1,25 @@
+# This file should contain messages and labels specific to this share extension
+# Put here things like:
+#   Content Model Aspect and Type Labels
+#   Form field labels
+#   Doc lib Action labels and messages
+#   Doc Lib Action Forms labels
+#
+
+# 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
+

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml

@@ -12,7 +12,7 @@
           <web-framework>
             <dojo-pages>
               <packages>
-                <package name="example" location="js/example"/>
+                <package name="tutorials" location="resources/${artifactId}/js/tutorials"/>
               </packages>
             </dojo-pages>
           </web-framework>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js

@@ -3,7 +3,7 @@ model.jsonModel = {
         id: "SET_PAGE_TITLE",
         name: "alfresco/header/SetTitle",
         config: {
-            title: "This is a simple page"
+            title: "This is a sample HELLO page"
         }
     },
         {
@@ -21,7 +21,7 @@ model.jsonModel = {
                     },
                     {
                         id: "DEMO_SIMPLE_MSG",
-                        name: "example/widgets/TemplateWidget"
+                        name: "tutorials/widgets/TemplateWidget"
                     }
                 ]
             }

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.bat

@@ -0,0 +1,12 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::      Dev environment startup script for Alfresco Community     ::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+@ECHO OFF
+
+IF "%MAVEN_OPTS%" == "" (
+    ECHO The environment variable 'MAVEN_OPTS' is not set, setting it for you
+    SET MAVEN_OPTS=-Xms256m -Xmx2G
+)
+ECHO MAVEN_OPTS is set to '%MAVEN_OPTS%'
+
+mvnDebug clean install alfresco:run

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 if [[ -z ${MAVEN_OPTS} ]]; then
     echo "The environment variable 'MAVEN_OPTS' is not set, setting it for you";
-    MAVEN_OPTS="-Xms256m -Xmx1524m -XX:PermSize=300m"
+    MAVEN_OPTS="-Xms256m -Xmx2G"
 fi
 echo "MAVEN_OPTS is set to '$MAVEN_OPTS'";
-mvn clean install -Pamp-to-war
+mvnDebug clean install alfresco:run

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/pom.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>${artifactId}</artifactId>
+    <name>Integration Tests Module</name>
+    <description>Integration Tests module for in-container integration testing - part of AIO - SDK 3</description>
+    <packaging>jar</packaging> <!-- Note. this just runs Integration Tests, but it needs to be a JAR otherwise
+                                            nothing is compiled (i.e. you cannot set it to pom) -->
+
+    <parent>
+        <groupId>${groupId}</groupId>
+        <artifactId>${rootArtifactId}</artifactId>
+        <version>${version}</version>
+    </parent>
+
+    <properties>
+    </properties>
+
+    <dependencies>
+        <!-- Bring in any custom module that should be tested, by default we bring in the Platform JAR module
+             that is generated for the AIO project -->
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-platform-jar</artifactId>
+            <version>${version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.zeroturnaround</groupId>
+                <artifactId>jrebel-maven-plugin</artifactId>
+                <version>${jrebel.version}</version>
+                <configuration>
+                    <rebelXmlDirectory>${project.build.testOutputDirectory}</rebelXmlDirectory>
+                </configuration>
+            </plugin>
+
+            <!-- Make sure we attach the tests so we can include them when running -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Runs the integration tests, any class that follows naming convention
+                 "**/IT*.java", "**/*IT.java", and "**/*ITCase.java" will be considered an integration test -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.19.1</version>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify-test</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>2.19.1</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
+            <!-- Run Alfresco Tomcat embedded -->
+            <plugin>
+                <groupId>org.alfresco.maven.plugin</groupId>
+                <artifactId>alfresco-maven-plugin</artifactId>
+                <version>${alfresco.sdk.version}</version>
+                <executions>
+                    <execution>
+                        <id>start-alfresco</id>
+                        <goals>
+                            <goal>it</goal>
+                        </goals>
+                        <phase>pre-integration-test</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/CustomContentModelIT.java

@@ -0,0 +1,191 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/**
+ * Copyright (C) 2017 Alfresco Software Limited.
+ * <p/>
+ * This file is part of the Alfresco SDK project.
+ * <p/>
+ * Licensed 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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}.platformsample;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.rad.test.AbstractAlfrescoIT;
+import org.alfresco.rad.test.AlfrescoTestRunner;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.nodelocator.CompanyHomeNodeLocator;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Integration Test sample for a custom content model.
+ * See {@link DemoComponentIT} for more info.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @since 3.0
+ */
+@RunWith(value = AlfrescoTestRunner.class)
+public class CustomContentModelIT extends AbstractAlfrescoIT {
+    private static final String ACME_MODEL_NS = "{http://www.acme.org/model/content/1.0}";
+    private static final String ACME_MODEL_LOCALNAME = "contentModel";
+    private static final String ACME_DOCUMENT_TYPE = "document";
+    private static final String ACME_SECURITY_CLASSIFIED_ASPECT = "securityClassified";
+    private static final String ACME_DOCUMENT_ID_PROPNAME = "documentId";
+
+    @Test
+    public void testCustomContentModelPresence() {
+        Collection<QName> allContentModels = getServiceRegistry().getDictionaryService().getAllModels();
+        QName customContentModelQName = createQName(ACME_MODEL_LOCALNAME);
+        assertTrue("Custom content model " + customContentModelQName.toString() +
+                " is not present", allContentModels.contains(customContentModelQName));
+    }
+
+    @Test
+    public void testCreateAcmeDocument() {
+        // Create the ACME Doc file
+        QName type = createQName(ACME_DOCUMENT_TYPE);
+        String textContent = "Hello World!";
+        String documentId = "DOC001";
+        Map<QName, Serializable> nodeProperties = new HashMap<>();
+        nodeProperties.put(createQName(ACME_DOCUMENT_ID_PROPNAME), documentId);
+        nodeProperties.put(createQName("securityClassification"), "Company Confidential");
+        NodeRef nodeRef = createNode("AcmeFile.txt", type, nodeProperties);
+        addFileContent(nodeRef, textContent);
+
+        // Add an Aspect to the file (could be a custom aspect...)
+        Map<QName, Serializable>  aspectProperties = new HashMap<>();
+        aspectProperties.put(ContentModel.PROP_TITLE, "Some Doc Title");
+        aspectProperties.put(ContentModel.PROP_DESCRIPTION, "Some Doc Description");
+        getServiceRegistry().getNodeService().addAspect(nodeRef, ContentModel.ASPECT_TITLED, aspectProperties);
+
+        // Assert that the file is created correctly
+        assertEquals("Invalid type", type, getServiceRegistry().getNodeService().getType(nodeRef));
+        assertTrue("Missing security aspect",
+                getServiceRegistry().getNodeService().hasAspect(nodeRef, createQName(ACME_SECURITY_CLASSIFIED_ASPECT)));
+        assertTrue("Missing titled aspect",
+                getServiceRegistry().getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_TITLED));
+        assertEquals("Invalid property value", documentId,
+                getServiceRegistry().getNodeService().getProperty(nodeRef, createQName(ACME_DOCUMENT_ID_PROPNAME)));
+        readTextContent(nodeRef).equals(textContent);
+
+        // Clean up node
+        if (nodeRef != null) {
+            getServiceRegistry().getNodeService().deleteNode(nodeRef);
+        }
+    }
+
+    /**
+     * ==================== Helper Methods ============================================================================
+     */
+
+    /**
+     * Create a QName for the ACME content model
+     *
+     * @param localname the local content model name without namespace specified
+     * @return the full ACME QName including namespace
+     */
+    private QName createQName(String localname) {
+        return QName.createQName(ACME_MODEL_NS + localname);
+    }
+
+    /**
+     * Create a new node, such as a file or a folder, with passed in type and properties
+     *
+     * @param name the name of the file or folder
+     * @param type the content model type
+     * @param properties the properties from the content model
+     * @return the Node Reference for the newly created node
+     */
+    private NodeRef createNode(String name, QName type, Map<QName, Serializable> properties) {
+        NodeRef parentFolderNodeRef = getCompanyHomeNodeRef();
+        QName associationType = ContentModel.ASSOC_CONTAINS;
+        QName associationQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,
+                QName.createValidLocalName(name));
+        properties.put(ContentModel.PROP_NAME, name);
+        ChildAssociationRef parentChildAssocRef = getServiceRegistry().getNodeService().createNode(
+                parentFolderNodeRef, associationType, associationQName, type, properties);
+
+        return parentChildAssocRef.getChildRef();
+    }
+
+    /**
+     * Add some text content to a file node
+     *
+     * @param nodeRef the node reference for the file that should have some text content added to it
+     * @param fileContent the text content
+     */
+    private void addFileContent(NodeRef nodeRef, String fileContent) {
+        boolean updateContentPropertyAutomatically = true;
+        ContentWriter writer = getServiceRegistry().getContentService().getWriter(nodeRef, ContentModel.PROP_CONTENT,
+                updateContentPropertyAutomatically);
+        writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+        writer.setEncoding("UTF-8");
+        writer.putContent(fileContent);
+    }
+
+    /**
+     * Read text content for passed in file Node Reference
+     *
+     * @param nodeRef the node reference for a file containing text
+     * @return the text content
+     */
+    private String readTextContent(NodeRef nodeRef) {
+        ContentReader reader = getServiceRegistry().getContentService().getReader(nodeRef, ContentModel.PROP_CONTENT);
+        if (reader == null) {
+            return ""; // Maybe it was a folder after all
+        }
+
+        InputStream is = reader.getContentInputStream();
+        try {
+            return IOUtils.toString(is, "UTF-8");
+        } catch (IOException ioe) {
+            throw new RuntimeException(ioe);
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the node reference for the /Company Home top folder in Alfresco.
+     * Use the standard node locator service.
+     *
+     * @return the node reference for /Company Home
+     */
+    private NodeRef getCompanyHomeNodeRef() {
+        return getServiceRegistry().getNodeLocatorService().getNode(CompanyHomeNodeLocator.NAME, null, null);
+    }
+}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/DemoComponentIT.java

@@ -0,0 +1,73 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/**
+ * Copyright (C) 2017 Alfresco Software Limited.
+ * <p/>
+ * This file is part of the Alfresco SDK project.
+ * <p/>
+ * Licensed 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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}.platformsample;
+
+import org.alfresco.rad.test.AbstractAlfrescoIT;
+import org.alfresco.rad.test.AlfrescoTestRunner;
+import org.alfresco.rad.test.Remote;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Integration Test of the DemoComponent using the Alfresco Test Runner.
+ * The Alfresco Test Runner (i.e. AlfrescoTestRunner.class) will check if it is running in an Alfresco instance,
+ * if so it will execute normally locally. On the other hand, if it detects no
+ * Alfresco Spring context, then it will make a call to a custom Web Script that
+ * will execute this test in the running container remotely. The remote location is
+ * determined by the @Remote config.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @since 3.0
+ */
+@RunWith(value = AlfrescoTestRunner.class)
+// Specifying the remote endpoint is not required, it
+// will default to http://localhost:8080/alfresco if
+// not provided. This shows the syntax but simply
+// sets the value back to the default value.
+@Remote(endpoint = "http://localhost:8080/alfresco")
+public class DemoComponentIT extends AbstractAlfrescoIT {
+
+    @Test
+    public void testGetCompanyHome() {
+        DemoComponent demoComponent = (DemoComponent) getApplicationContext().getBean("${package}.DemoComponent");
+        NodeRef companyHome = demoComponent.getCompanyHome();
+        assertNotNull(companyHome);
+        String companyHomeName = (String) getServiceRegistry().getNodeService().getProperty(
+                companyHome, ContentModel.PROP_NAME);
+        assertNotNull(companyHomeName);
+        assertEquals("Company Home", companyHomeName);
+    }
+
+    @Test
+    public void testChildNodesCount() {
+        DemoComponent demoComponent = (DemoComponent) getApplicationContext().getBean("${package}.DemoComponent");
+        NodeRef companyHome = demoComponent.getCompanyHome();
+        int childNodeCount = demoComponent.childNodesCount(companyHome);
+        assertNotNull(childNodeCount);
+        // There are 7 folders by default under Company Home
+        assertEquals(7, childNodeCount);
+    }
+}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/HelloWorldWebScriptIT.java

@@ -0,0 +1,75 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/**
+ * Copyright (C) 2017 Alfresco Software Limited.
+ * <p/>
+ * This file is part of the Alfresco SDK project.
+ * <p/>
+ * Licensed 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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}.platformsample;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Integration Test (IT) for Hello World web script.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @version 1.0
+ * @since 3.0
+ */
+public class HelloWorldWebScriptIT {
+    @Test
+    public void testWebScriptCall() throws Exception {
+        String webscriptURL = "http://localhost:8080/alfresco/service/sample/helloworld";
+        String expectedResponse = "Message: 'Hello from JS!' 'HelloFromJava'";
+
+        // Login credentials for Alfresco Repo
+        CredentialsProvider provider = new BasicCredentialsProvider();
+        UsernamePasswordCredentials credentials = new UsernamePasswordCredentials("admin", "admin");
+        provider.setCredentials(AuthScope.ANY, credentials);
+
+        // Create HTTP Client with credentials
+        CloseableHttpClient httpclient = HttpClientBuilder.create()
+                .setDefaultCredentialsProvider(provider)
+                .build();
+
+        // Execute Web Script call
+        try {
+            HttpGet httpget = new HttpGet(webscriptURL);
+            HttpResponse httpResponse = httpclient.execute(httpget);
+            assertEquals("Incorrect HTTP Response Status",
+                    HttpStatus.SC_OK, httpResponse.getStatusLine().getStatusCode());
+            HttpEntity entity = httpResponse.getEntity();
+            assertNotNull("Response from Web Script is null", entity);
+            assertEquals("Incorrect Web Script Response", expectedResponse, EntityUtils.toString(entity));
+        } finally {
+            httpclient.close();
+        }
+    }
+}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/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

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/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

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/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

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/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.
 ########################################################################################################################
 
@@ -37,11 +36,16 @@ 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
+#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
@@ -53,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