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

This reverts commit b2afebed09.

KEYS

@@ -9,6 +9,10 @@ Developers:
         (gpg --list-key <your email>
              && gpg --armor --export <your email>) >> this file.
 
+################################################################
+# Gabriele Columbro
+################################################################
+
 pub   4096R/6FE5701E 2012-03-25
 uid                  Gabriele Columbro (VALID CODE SIGNING KEY) <gabriele@apache.org>
 sub   4096R/E97059F3 2012-03-25
@@ -86,4 +90,66 @@ hrGAueS2lH5DUpjZPqClR+txnAK+hVCuFogoWsdsbRHMLkqKqhnQjWnvRrU0ud9j
 ytG/XwLK3RL7LTmPIC9RqlO1U1A3h5Ykw2INH/bB90lBxmydmp/PHpkhjEAEvzGW
 r+ipOwsWpF6kLIHUT2LuPxLqTGQCrqYtJyTp61tE
 =GUM9
+-----END PGP PUBLIC KEY BLOCK-----
+
+################################################################
+# Alfresco Software, Inc - PGP key
+################################################################
+
+pub   4096R/DAD3B670 2014-10-20 [expires: 2015-10-20]
+      Key fingerprint = 6959 A697 47E2 7AC4 E1E7  1636 199D 99B1 DAD3 B670
+uid                  Alfresco Software, Inc (GPG) <info@alfresco.com>
+sub   4096R/A4B70B45 2014-10-20 [expires: 2015-10-20]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+mQINBFRFM3EBEADveqoXdxufZiP+hK992UJO9OIumDts9SlirI4VviyRlCn/qc3X
+5wzAAsTNRBJjsk3S3O3EfmK79GodIb0ebnQSbv6+EnwPK0uwS0ykoy7JrMUHVBY+
+zI9AwGIe0UpCRXfPH3x0O1Psi1fcKGR/Qs2ouTnCpzDZRq3kFt7/iCXm6t8QpaxE
+y4KNxT/S8MeGydslqgbEA4fCZ6RP9kzFs8tCNyv9WxHkcb0oos/nC2ihJy3HZATO
+A2qeTxS5pf6O1hJuE7XRIRCPTN1j0uSAl4ebDKPn4uANz8MwYcZBz89lWVmP/wEz
+AoN8jWjqb/SstURj+czjXoxhoxMaLDMjdw5RoJsLUmlfp2j9eaFbxmUl103wUL+O
+R+6sk5pXHpvifjeI/AjNTaZe6WVfkgcUqkHmw0GUgdASgBLBDciGd+O4sXr/L/iZ
+wxhdxcubWy4MbKcy7QlcS4Z4FwK6jjPQKjn+7PT3Wexh8SAX0661gntV7Rr/SYIY
+edyRdtLd+SP+TuOn4wQY5x8ahHqGi4PDoSaCMAZ8jbQnbAXXeOlkBuyDm+Z4iGDC
+OQgjvvQufB2ZA1ml9DjtZOWIdgUQfanGaO8TW+V5v+PFvfMkRFIMMyS8WEp6ePT/
+IOBDxUBQ0BZ1BktkQ+Oifi179EyvghpePciUWX5oDf6AfW/QfLhnkVhQPQARAQAB
+tDBBbGZyZXNjbyBTb2Z0d2FyZSwgSW5jIChHUEcpIDxpbmZvQGFsZnJlc2NvLmNv
+bT6JAj4EEwECACgFAlRFM3ECGwMFCQHhM4AGCwkIBwMCBhUIAgkKCwQWAgMBAh4B
+AheAAAoJEBmdmbHa07ZwTtYP/jdMOUFvUqAwaiDBap0+DqyyFgeWfa90b3O6LlAf
+BeKin4lq8TEVL1CCehRSILAgd0nQQYHeJvLwpvZNl4t2TBFk5e/Xd4gHdszum4Ms
+aJ0qc2G61ep5vE5z11Ca2vWLEG1Org+iVtZuMZcsCtPhFjyHE1PRU1s0ApoIXZxt
+z35pgz5PSldPpOk4nuUKIhLLTpNLNd4fgbPiHhyqJloTMsOEycZ+W5Em2Ib2/kxx
+0GIjAy5A9IlezALKengZ4NjHFwcddcP6+2rFgBTY/7KhhGNyOghwSIIJOdp0BQwD
+bSN26e5WpYT+gja44QZ44KdMpOcxH8Qt0lJmjULizxcbYTPMsoPF3Jszm0E5auOQ
+y2cixDEfmioqgJ4KKS6AIXd/yfLEvsGEU1Zz1a1yDQz12ZhzBa/GtoQRhzWErspR
+7kMPiGKQEhQowB7vHfiCmVhx89RWPwZFFyLz92jS11ZGpeBlWF4hMSefQR7sFWLi
+rYw0LOyMyFyz9P60ZKX18LHltxsrsteJA7zARcS0uv112O7wSTX1k44s5fiaWlVR
+Ciuchcp0eTcsYa4Jiz4yZNnJhRi7tnsQJOXYF4IjGAxnJoBLSUUt2uEWtMg09m5F
+vgrCNcc8HFy1hIIHy0l5CaLJY/5x9Z1Lg2dbwVP7+goTRogRGvpdjy7/eMlQEAgm
+HMtsuQINBFRFM3EBEADCohKTxy3JYJ3dPzxhD/76nX0zkyvuhepVXAkpzjhWSx9r
+9RQSB6WLnczlZVriQKVPR6RZ7fn4XhLim3v9e9c188R1WeUvuHWaJXDAvBWFarLu
+y7kd1ZRpS0UWWE+k/WBruT5rEqjpW4Un/7WINsr972Ic7IFiv5ISUC7h/ylym5T1
+w15WRZnMF96tLmMjzGdqJYrbu7Y4ZPYr5VwWnd9hE9Cal3YMMsfcXlIWOzw7BRDO
+aWmMsWyFiVkwCeAZOSYthu4Qdo3bSlGo5C46JuRcdU1ZimZKztC1qlihiju7oWfa
+3hJT/uWFu06IAdcI6lq4yEb+iG73BNUGNMDzpTeWLW7Q3IByZ/e9/DzFJcjsDf5N
+jCzJGxAtEJ28egrZe6/Fk6yBwE0+nzUmOPU3qqi57aFFajfdV89SoQwKG83IpNJl
+L9vbE62Iljm0DNK3VEotw9OMc6B3z6TfatVclqLFTH5Q+4rNcCytpK747loGVJcP
+KFs1FzFj+hW2MkFcnY1JbuaSuyrhPVpg4Z1bjxLVLdlisYm0AL+n+z0tmFO45XJ2
+mS06ckpqFAhk5HOOMOd/9+Qi3p9orE6dFM+TIWnxDphpws43O+FSYM8OJk7saGos
+DNMvm9C0oz07MwMuthkLmSBsWmkZYXrvkUY1lrTdpyqqs11qllBZ1PsRATKeIQAR
+AQABiQIlBBgBAgAPBQJURTNxAhsMBQkB4TOAAAoJEBmdmbHa07ZwQl4P/2FH+4Sa
+JJgaNGoyyo1Oh1Xd1OMHf++V7FpXxHHmgEv6bTz3E8xHTMA7Zm1iBIPGrIo2loKe
+49p3gbGFtvZLLT31Tg+usUN62QntKYOIiztdjsxzTskBgJH+A4Ucz7O1NsN6GQXF
+QgGFlEpWApXCK8ogNp6ntwxGCyOFvZujuJjSFUZcpNEGhOYhYuKvo18qboP3RgVy
+o74FPtPvh3YMz9DLRXeVbhhIq0oejek5z0aOXEjgZipVO4U7uDO5EVcG57jIVfiI
+WM681KHG/Djx64GmSi9wo+P687Ib7+UHSzBTeEm9YVRNNSQFbuvxqq9XhDctkkbZ
+m/QRbQXJFPQJcDOLLH06JNQ+/KvT8uwduiBFs2x77qKrVCxqCQU8XwY+KnyGouf9
+sLdxDZwGoXFbnCyRKFH+fqoIMdcYzIT/VvGswTCNqSOvDxnSNO9REVbdsIJwenqt
+QetRR7SVYKfcyLMCtMek3Fgst85khwP8tIYAEerE+XN04b1FfD3mjqvgBdUY7IDM
+W1NVRTtjlX46ltNvtERO8JGYMqlRW/wpDXQzRxryNY7frXA+fhog2L53cOK/Fwc8
+UcbLubQPkh/6+w4SybT2F8otOB1J8KZ0tzbTd5JxuX0V0AD8OjH+uuN67r5bQBk9
+ARVlLqDOpHP01PW6WUQta2xAQ2mshuQZTX1H
+=3Y/D
 -----END PGP PUBLIC KEY BLOCK-----

README.md

@@ -1,89 +1,79 @@
 # [![Alfresco SDK logo](https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg)](#features) Alfresco SDK
 
-SDK for Alfresco Development, Testing, packaging and custom project lifecycle management based on Apache Maven. 
+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).
 
-Includes support for rapid and standard development, testing, packaging, versioning and release of your Alfresco integration and extension projects. 
-
-## SDK 2.0.0 available in Maven Central
-
-The SDK 2.0.0 is finally [released in Maven Central](http://search.maven.org/#search|ga|1|alfresco%20sdk). 
-
-- *To create a new Alfresco project*: Run a 
-
-```bash
-mvn archetype:generate -Dfilter=org.alfresco:
-```
-
-and use one of the available archetypes (AMP, Share AMP, All in One)
-
-- *To use the SDK in your project:*  Add the below parent reference snippet to the existing project (*NOTE*: you might need folder layout changes) to inherit features from Alfresco SDK POM:
-
-```xml
-<parent>
-   <groupId>org.alfresco.maven</groupId>
-   <artifactId>alfresco-sdk-parent</artifactId>
-   <version>2.0.0</version>
-</parent>
-
-```
-## Resources 
-
-### Alfresco Official Docs
-
-- Documentation for the SDK on Alfresco Community (latest) is available [here](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html)
-
-- Documentation for the SDK on Alfresco Enterprise (5.0) is available [here](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html)
-
-### Developer Documentation
-
-**SDK 2.x**: Full developer (Maven) documentation is available at the [Alfresco SDK site](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html).
-
-
-
-# Check the SDK in action!
-
-For an overview of the SDK potential check out this video:
-
-[![Alfresco SDK 2.x howto](http://img.youtube.com/vi/utYZaVe9Nd0/0.jpg)](https://www.youtube.com/watch?v=utYZaVe9Nd0)
-
-The SDK is composed of:
-
-- An [SDK Parent POM](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/poms/alfresco-sdk-parent/index.html) which you can use in your projects to enable rapid Alfresco development features
-- An [Alfresco Platform Distribution POM](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-platform-distribution/latest/index.html) which pre-configures versions of Alfresco and common 3rd party dependency libraries, for stability purposes
-- A [Maven Alfresco Plugin](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/plugins/alfresco-maven-plugin/index.html) which provides AMP packaging and installation facilities (a la MMT) and other common goals for Alfresco development
-- A number of *Maven Archetypes* (sample projects) including:
-	1. [Alfresco Repository AMP Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/alfresco-amp-archetype/index.html)
-	2. [Alfresco Share AMP Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/share-amp-archetype/index.html)
-	3. [Alfresco All-in-One Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/alfresco-allinone-archetype/index.html)
-
-
-### Samples 
-
-Advanced sample projects are maintained by @ohej in the [Alfresco SDK Samples project](https://github.com/Alfresco/alfresco-sdk-samples/).
-
-
-### Contribute
-
-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).
-
-## Maven Repositories
-
-The Alfresco SDK is released in Maven Central as of version 2.0-beta-1. 
-
-Alfresco (Community and Enterprise) artifacts are instead hosted in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/nexus/). 
-
-Alfresco Community artifacts (JARs, WARs, AMPs, poms) and SDK artifacts are publicly available. 
-
-for Enterprise and Premiere licensed software access you need to get credential via the Alfresco Enterprise Support. See [public docs](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html) or [this KB (login required)](https://myalfresco.force.com/support/articles/en_US/Technical_Article/Where-can-I-find-the-repository-for-Enterprise-Maven-artifacts) for more details.
-
-## License and Support
-This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). It's a community driven project which is supported for Alfresco Development (please refere to the official [Alfresco Documentation](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html) for supported features.
+## 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
-- 2014-12-20: SDK 2.0.0 in staging. If you want early access to the release candidate build and want to participate to the testing process check [this page](https://github.com/Alfresco/alfresco-sdk/wiki/SDK-Supported-Features-and-Test-plan) and report issues [here](https://github.com/Alfresco/alfresco-sdk/issues).
-- 2014-09-10: SDK 2.0.0-beta-4 released to Maven Central and in the [Archetype Catalog](http://repo1.maven.org/maven2/archetype-catalog.xml)!
-- 2014-09-09: SDK 2.0.0-beta-3 released to Maven Central
-- 2014-08-30: SDK 2.0.0-beta-1 and 2.0.0-beta-2 available in [Maven Central](http://search.maven.org/#search|ga|1|org.alfresco.maven)
+
+- 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), including tags, branches, issues. Allow a little time for a full cleanup of issue labels and to sort repository permissions. Please update obsolete references and bear with us as we update Alfresco Documentation to this change.
+- 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.2.0 (latest) visit the offical Alfresco Documentation for:
+
+- [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.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:
+ - [Alfresco SDK Samples for 5.1 (JARs)](https://github.com/Alfresco/alfresco-sdk-samples/tree/alfresco-51/all-in-one).
+ - [Alfresco SDK Samples for 5.0 (AMPs)](https://github.com/Alfresco/alfresco-sdk-samples/tree/alfresco-50/all-in-one).
+
+### Command reference
+A list of supported features and commands is kept in the [Alfresco Official Docs](http://docs.alfresco.com/5.1/concepts/alfresco-sdk-cmd-reference.html).
+
+### Want to get up to speed quickly in Eclipse? Check out this video!
+
+[![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/). 
+
+## 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).
+
+## Maven repositories
+- As of version 2.0-beta-1, The Alfresco SDK is released in [Maven Central](http://search.maven.org/#search|ga|1|alfresco-sdk). Previous versions are available in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/).
+- Alfresco (Community and Enterprise) artifacts are  hosted in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/).
+- Alfresco Community artifacts (JARs, WARs, AMPs, poms) and SDK artifacts are publicly available.
+
+*NOTE:* For Enterprise and Premiere licensed software access you need to get credential via the Alfresco Enterprise Support. See [Maven Alfresco Enterprise setup](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-using-enterprise-edition.html).
+
+### Alfresco Artifacts Repository
+
+#### Alfresco Releases
+You can use the following snippet in your pom.xml to access releases on Alfresco Artifact repository:
+
+```xml
+<repository>
+    <id>alfresco-public</id>
+    <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+</repository>
+```
+
+#### SDK Snapshots
+To test new unreleased (unsupported) features, you can use the following snippet in your pom.xml to access SDK nightlies (SNAPSHOTS) from the OSS Sonatype repository:
+
+```xml
+<repository>
+    <id>oss-sonatype-snapshots</id>
+    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+</repository>
+```
+
+## For Developers that want to contribute to the SDK
+See the [Developers Wiki page](https://github.com/Alfresco/alfresco-sdk/wiki/Developer-Wiki).
 

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.1.0-beta-1</version>
+    <version>3.0.0-beta-5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -24,6 +24,8 @@
                 <include>archetype-resources/pom.xml</include>
                 <include>archetype-resources/run.sh</include>
                 <include>archetype-resources/run.bat</include>
+                <include>archetype-resources/debug.sh</include>
+                <include>archetype-resources/debug.bat</include>
                 <include>META-INF/maven/archetype-metadata.xml</include>
             </includes>
             <filtering>true</filtering>
@@ -34,15 +36,19 @@
                 <exclude>archetype-resources/pom.xml</exclude>
                 <exclude>archetype-resources/run.sh</exclude>
                 <exclude>archetype-resources/run.bat</exclude>
+                <exclude>archetype-resources/debug.sh</exclude>
+                <exclude>archetype-resources/debug.bat</exclude>
                 <exclude>META-INF/maven/archetype-metadata.xml</exclude>
             </excludes>
             <filtering>false</filtering>
         </resource>
       </resources>
+
       <plugins>
         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>2.7</version>
+            <version>${maven.resource.version}</version>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>

archetypes/activiti-jar-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="AMP Archetype for Alfresco. Provides rapid development, IDE integration, and running embedded an Alfresco Repo AMP"
+        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>
@@ -9,6 +9,7 @@
             <defaultValue>1.0-SNAPSHOT</defaultValue>
         </requiredProperty>
     </requiredProperties>
+
     <fileSets>
         <fileSet filtered="true" packaged="true" encoding="UTF-8">
             <directory>src/main/java</directory>
@@ -22,45 +23,46 @@
                 <include>**/*.java</include>
             </includes>
         </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-            <directory>src/main/amp</directory>
+        <fileSet encoding="UTF-8" filtered="true">
+            <directory>src/main/resources</directory>
             <includes>
-                <include>**</include>
+                <include>**/bpmn-models/**</include>
             </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/main/resources</directory>
             <excludes>
-                <exclude>**/*-context.xml</exclude>
+                <exclude>**/bpmn-models/**</exclude>
             </excludes>
         </fileSet>
-        <fileSet encoding="UTF-8" filtered="true" packaged="false">
-            <directory>src/main/amp</directory>
-            <includes>
-                <include>**/*-context.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet filtered="false" encoding="UTF-8">
+        <fileSet encoding="UTF-8" filtered="true">
             <directory>src/test/resources</directory>
             <includes>
-                <include>**/*</include>
+                <include>log4j-dev.properties</include>
             </includes>
         </fileSet>
-        <fileSet filtered="false" encoding="UTF-8">
-            <directory>src/test/properties</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/test/resources</directory>
+            <excludes>
+                <exclude>log4j-dev.properties</exclude>
+            </excludes>
         </fileSet>
-        <fileSet filtered="false" encoding="UTF-8">
-            <directory>tomcat</directory>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/test/license</directory>
             <includes>
-                <include>**/*.xml</include>
+                <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.1</activiti.version>
+
+        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
+        <jrebel.version>1.1.6</jrebel.version>
+
+        <!-- Compile with Java 7, default is 5 -->
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <!-- The main Activiti Enterprise application dependency that brings in all
+             needed classes to compile your customizations -->
+        <dependency>
+            <groupId>${activiti.groupId}</groupId>
+            <artifactId>activiti-app-logic</artifactId>
+            <version>${activiti.version}</version>
+            <exclusions>
+                <!-- Exclude the SLF4J JAR so we don't get multiple binding warnings when running -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Testing -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Logging, maybe needed for testing....
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.5</version>
+        </dependency>
+        -->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Create the BAR with project process definitions, forms etc -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <id>create-app-zip</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <zip destfile="${project.build.directory}/${project.artifactId}-app-${project.version}.zip">
+                                    <fileset dir="src/main/resources/apps/helloworld">
+                                        <include name="**"/>
+                                    </fileset>
+                                </zip>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--
+                The Alfresco Maven Plugin contains all the logic to run the extension
+                in an embedded Tomcat with the H2 database.
+                -->
+            <plugin>
+                <groupId>org.alfresco.maven.plugin</groupId>
+                <artifactId>alfresco-maven-plugin</artifactId>
+                <version>${alfresco.sdk.version}</version>
+                <configuration>
+                    <!-- We need the flat file H2 database to run Activiti -->
+                    <enableH2>true</enableH2>
+
+                    <!-- Bring in the Activiti Workflow Engine and Management webapp (i.e. activiti-app.war) -->
+                    <enableActivitiApp>true</enableActivitiApp>
+
+                    <!-- Optionally bring in the Activiti Admin App (i.e. activiti-admin.war) -->
+                    <enableActivitiAdmin>false</enableActivitiAdmin>
+
+                    <!-- Disable all Alfresco ECM apps by default -->
+                    <alfrescoEdition>community</alfrescoEdition>
+                    <enablePlatform>false</enablePlatform>
+                    <enableSolr>false</enableSolr>
+                    <enableShare>false</enableShare>
+
+                    <!--
+                       JARs that should be overlayed/applied to the Activiti App WAR
+                       (i.e. activiti-app.war)
+                       -->
+                    <activitiModules>
+                        <!-- Bring in this JAR project, need to be included here, otherwise resources from META-INF
+                             will not be loaded, such as the test.html page
+                        -->
+                        <moduleDependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <version>${project.version}</version>
+                        </moduleDependency>
+                    </activitiModules>
+                </configuration>
+            </plugin>
+
+            <!-- Hot reloading with JRebel -->
+            <plugin>
+                <groupId>org.zeroturnaround</groupId>
+                <artifactId>jrebel-maven-plugin</artifactId>
+                <version>${jrebel.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-rebel-xml</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- For more information about how to configure JRebel plugin see:
+                         http://manuals.zeroturnaround.com/jrebel/standalone/maven.html#maven-rebel-xml -->
+                    <classpath>
+                        <fallback>all</fallback>
+                        <resources>
+                            <resource>
+                                <!--
+                                Empty resource element marks default configuration. By
+                                default it is placed first in generated configuration.
+                                -->
+                            </resource>
+                        </resources>
+                    </classpath>
+
+                    <!--
+                      alwaysGenerate - default is false
+                      If 'false' - rebel.xml is generated if timestamps of pom.xml and the current rebel.xml file are not equal.
+                      If 'true' - rebel.xml will always be generated
+                    -->
+                    <alwaysGenerate>true</alwaysGenerate>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <nonFilteredFileExtensions> <!-- jpg, jpeg, gif, bmp and png are added automatically -->
+                        <nonFilteredFileExtension>ftl</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>acp</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>svg</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>doc</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>docx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ppt</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>pptx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>bin</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>lic</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>swf</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>msg</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>eot</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>css</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ico</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>psd</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>js</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <resources>
+            <!-- Filter the resource files in this project and do property substitutions -->
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <!-- The Project JAR Should not contain any process definition stuff,
+                     it cannot be deployed via JAR in Activiti Enterprise -->
+                <excludes>
+                    <exclude>apps/**</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <testResources>
+            <!-- Filter the test resource files in this project and do property substitutions -->
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+            <!-- Copy over the Activiti license to the classpath -->
+            <testResource>
+                <directory>src/test/license</directory>
+                <filtering>false</filtering>
+            </testResource>
+        </testResources>
+    </build>
+
+    <!--
+        Alfresco Maven Repositories
+        -->
+    <repositories>
+        <!-- Alfresco ECM -->
+        <repository>
+            <id>alfresco-public</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+        </repository>
+        <repository>
+            <id>alfresco-public-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+        </repository>
+        <!-- Alfresco Enterprise Edition Artifacts, put username/pwd for server in settings.xml -->
+        <repository>
+            <id>alfresco-private-repository</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+        </repository>
+
+        <!-- Activiti BPM -->
+        <repository>
+            <id>activiti-public</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases/</url>
+        </repository>
+        <repository>
+            <id>activiti-public-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+        </repository>
+        <!-- Activiti Enterprise Edition Artifacts, put username/pwd for server in settings.xml -->
+        <repository>
+            <id>activiti-private-repository</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>alfresco-plugin-public</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>alfresco-plugin-public-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>

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

@@ -0,0 +1,38 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package ${package}.tasks.service;
+
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.JavaDelegate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A sample service task Java implementation
+ *
+ * @author martin.bergljung@alfresco.com
+ */
+public class HelloWorldServiceTask implements JavaDelegate {
+    private static Logger logger = LoggerFactory.getLogger(HelloWorldServiceTask.class);
+
+    public void execute(DelegateExecution execution) throws Exception {
+        logger.debug("Hello World from the Java Service Task!");
+    }
+}

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/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/run-basic/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/goal.txt

@@ -0,0 +1 @@
+verify alfresco:run -Dmaven.tomcat.fork=true

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.1.0-beta-1</version>
+    <version>3.0.0-beta-5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   
@@ -23,7 +23,8 @@
                 <include>archetype-resources/pom.xml</include>
                 <include>archetype-resources/run.sh</include>
                 <include>archetype-resources/run.bat</include>
-                <include>archetype-resources/runner/src/main/webapp/index.html</include>
+                <include>archetype-resources/debug.sh</include>
+                <include>archetype-resources/debug.bat</include>
                 <include>META-INF/maven/archetype-metadata.xml</include>
             </includes>
             <filtering>true</filtering>
@@ -34,7 +35,8 @@
                 <exclude>archetype-resources/pom.xml</exclude>
                 <exclude>archetype-resources/run.sh</exclude>
                 <exclude>archetype-resources/run.bat</exclude>
-                <exclude>archetype-resources/runner/src/main/webapp/index.html</exclude>
+                <exclude>archetype-resources/debug.sh</exclude>
+                <exclude>archetype-resources/debug.bat</exclude>
                 <exclude>META-INF/maven/archetype-metadata.xml</exclude>
             </excludes>
             <filtering>false</filtering>
@@ -43,8 +45,9 @@
 
      <plugins>
         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>2.7</version>
+            <version>${maven.resource.version}</version>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>

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="repo-amp" dir="repo-amp" name="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,28 +42,24 @@
                     </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>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/test/resources</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/test/properties</directory>
-                    <includes>
-                        <include>**/*.properties</include>
-                    </includes>
-                </fileSet>
             </fileSets>
         </module>
 
-        <module id="share-amp" dir="share-amp" name="share-amp">
+        <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>
@@ -68,16 +72,16 @@
                         <include>**/*.java</include>
                     </includes>
                 </fileSet>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/main/amp</directory>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/main/resources/alfresco/web-extension</directory>
                     <includes>
-                        <include>**</include>
+                        <include>__artifactId__-slingshot-application-context.xml</include>
                     </includes>
                 </fileSet>
                 <fileSet filtered="true" packaged="false" encoding="UTF-8">
-                    <directory>src/test/resources</directory>
+                    <directory>src/main/resources/alfresco/web-extension/site-data/extensions</directory>
                     <includes>
-                        <include>**</include>
+                        <include>__artifactId__-example-widgets.xml</include>
                     </includes>
                 </fileSet>
                 <fileSet encoding="UTF-8" filtered="false">
@@ -85,71 +89,51 @@
                     <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="false">
-                    <directory>src/main/resources</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </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>
-            </fileSets>
-        </module>
-
-        <module id="runner" dir="runner" name="runner" filtered="false">
-            <fileSets>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <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>
+                    <excludes>
+                        <exclude>**/__artifactId__-slingshot-application-context.xml</exclude>
+                        <exclude>**/__artifactId__-example-widgets.xml</exclude>
+                    </excludes>
                 </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="false">
+            <directory>src/test/resources</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <excludes>
+                <exclude>**/dev-log4j.properties</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/test/properties</directory>
+            <includes>
+                <include>**/*.properties</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/test/license</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </fileSet>
         <fileSet encoding="UTF-8">
             <directory></directory>
             <includes>
+                <include>debug.sh</include>
+                <include>debug.bat</include>
                 <include>run.sh</include>
                 <include>run.bat</include>
+                <include>README.md</include>
             </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,38 @@
+<?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>
+        <!-- The main Alfresco Repo dependency for compiling Java code in src/main/java -->
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>alfresco-repository</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__-platform-jar/src/main/assembly/amp.xml

@@ -0,0 +1,54 @@
+<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">
+
+    <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/lib directory will end up in the /lib directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/lib</directory>
+            <outputDirectory>lib</outputDirectory>
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Anything in the assembly/web directory will end up in the /web directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/web</directory>
+            <outputDirectory>web</outputDirectory>
+            <filtered>true</filtered> <!-- Will filter files and substitute POM props such as for example ${project.name} -->
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+    <!-- Include the project artifact (JAR) in the /lib directory in the AMP -->
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+        </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/lib/README.md

@@ -0,0 +1,21 @@
+# 3rd party libraries (JARs) that should be included in WAR
+
+Put here any 3rd party libraries (JARs) that are needed by customizations, 
+but that are not part of the out-of-the-box libraries in the *alfresco/WEB-INF/lib* 
+directory. 
+
+**Note**. Module dependency needs to be set to amp for the libs to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-platform-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+  
+**Important**. If you need to use a library that is available out-of-the-box, then
+               include it as a *provided* dependency in the module.
+  
+ 

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

@@ -1,7 +1,7 @@
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
-package ${package}.demoamp;
+package ${package}.platformsample;
 
 /**
  * This class does nothing except dump some output to <i>system.out</i>.
@@ -13,6 +13,6 @@ public class Demo
 {
 	public void init()
 	{
-		System.out.println("SDK Demo AMP class has been loaded");
+		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

@@ -17,7 +17,7 @@ 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}.platformsample;
 
 import org.alfresco.repo.module.AbstractModuleComponent;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
  * @author Maurizio Pillitu
  */
 public class DemoComponent extends AbstractModuleComponent {
-    Log log = LogFactory.getLog(DemoComponent.class);
+    private static Log logger = LogFactory.getLog(DemoComponent.class);
 
     private NodeService nodeService;
 
@@ -55,8 +55,8 @@ public class DemoComponent extends AbstractModuleComponent {
     @Override
     protected void executeInternal() throws Throwable {
         System.out.println("DemoComponent has been executed");
-        log.debug("Test debug logging. Congratulation your 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 purposed. 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,50 @@
+#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}.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

@@ -1,7 +1,8 @@
 <webscript>
-    <shortname>Javascript Sample Webscript</shortname>
+    <shortname>Hello World Sample Webscript</shortname>
     <description>Hands back a greeting</description>
     <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

@@ -10,18 +10,31 @@
     <!-- The bootstrap-context.xml file is used for patch definitions, importers, 
 		 workflow, and loading custom content models.  -->
 
-
     <!-- Registration of new models -->
     <bean id="${package}.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

@@ -22,17 +22,21 @@
 <beans>
     
     <!-- A simple class that is initialized by Spring -->
-    <bean id="${package}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />
-    
-    <!-- A simple module component that will be executed once -->
-    <bean id="${package}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
-        <property name="moduleId" value="${project.artifactId}" />  <!-- See module.properties -->
+    <bean id="${package}.exampleBean" class="${package}.platformsample.Demo" init-method="init" />
+
+    <!-- A simple module component that will be executed once.
+         Note. this module component will only be executed once, and then there will be an entry for it in the Repo DB.
+         So doing for example $ mvn clean install alfresco:run twice will only execute this component the first time.
+         You need to remove /alf_data_dev for it to be executed again. -->
+    <bean id="${package}.exampleComponent" class="${package}.platformsample.DemoComponent" parent="module.baseComponent" >
+        <property name="moduleId" value="${artifactId}" />  <!-- See module.properties -->
         <property name="name" value="exampleComponent" />
         <property name="description" value="A demonstration component" />
-        <property name="sinceVersion" value="2.0" />
-        <property name="appliesFromVersion" value="2.0" />
+        <property name="sinceVersion" 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

@@ -1,16 +1,27 @@
-/*
-    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.
- */
+#set( $symbol_pound = '#' )
+#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
+	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.
+-->
+<beans>
+	<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,86 @@
+<?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>
+                        <facetable>true</facetable>
+                    </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

@@ -21,5 +21,6 @@
 	<!-- This is filtered by Maven at build time, so that module name is single sourced. -->
     <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
     <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
-    
+	<import resource="classpath:alfresco/module/${project.artifactId}/context/webscript-context.xml" />
+
 </beans>

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

@@ -24,7 +24,7 @@ module.id=${project.artifactId}
 #module.aliases=myModule-123, my-module
 module.title=${project.name}
 module.description=${project.description}
-module.version=${noSnapshotVersion}
+module.version=${project.version}
 
 # The following optional properties can be used to prevent the module from being added
 # to inappropriate versions of the WAR file.

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__-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>${alfresco.share.war.artifactId}</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,54 @@
+<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">
+
+    <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/lib directory will end up in the /lib directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/lib</directory>
+            <outputDirectory>lib</outputDirectory>
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Anything in the assembly/web directory will end up in the /web directory in the AMP -->
+        <fileSet>
+            <directory>src/main/assembly/web</directory>
+            <outputDirectory>web</outputDirectory>
+            <filtered>true</filtered> <!-- Will filter files and substitute POM props such as for example ${project.name} -->
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+    <!-- Include the project artifact (JAR) in the /lib directory in the AMP -->
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+        </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/lib/README.md

@@ -0,0 +1,19 @@
+# 3rd party libraries (JARs) that should be included in WAR
+
+Put here any 3rd party libraries (JARs) that are needed by customizations, 
+but that are not part of the out-of-the-box libraries in the *share/WEB-INF/lib* 
+directory. 
+
+**Note**. Module dependency needs to be set to amp for the libs to be applied by MMT:
+
+`
+<moduleDependency>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>some-share-jar</artifactId>
+    <version>${project.version}</version>
+    <type>amp</type>
+</moduleDependency>
+`
+  
+**Important**. If you need to use a library that is available out-of-the-box, then
+               include it as a *provided* dependency in the module.

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/module/__rootArtifactId__-share-jar/module.properties

@@ -24,7 +24,7 @@ module.id=${project.artifactId}
 #module.aliases=myModule-123, my-module
 module.title=${project.name}
 module.description=${project.description}
-module.version=${noSnapshotVersion}
+module.version=${project.version}
 
 # The following optional properties can be used to prevent the module from being added
 # to inappropriate versions of the WAR file.

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

@@ -1,11 +1,11 @@
+#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"
-       xmlns:hz="http://www.hazelcast.com/schema/spring"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                http://www.hazelcast.com/schema/spring
-                http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.xsd">
+                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
    
    <!--
     Define beans related to this Share extension here, such as
@@ -16,12 +16,12 @@
             placed in the alfresco-allinone/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml file
    -->
 
-   <!-- Add extension specific messages and labels -->
-   <bean id="com.mycompany.share-amp.resources"
+   <!-- Add module specific messages and labels -->
+   <bean id="${package}.${artifactId}.resources"
          class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
       <property name="resourceBundles">
          <list>
-            <value>alfresco.messages.custom</value>
+            <value>alfresco.web-extension.messages.${artifactId}</value>
          </list>
       </property>
    </bean>

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

@@ -1,7 +1,10 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
 <extension>
   <modules>
     <module>
-      <id>Example Aikau Widgets</id>
+      <id>${artifactId} - Example Aikau Widgets</id>
       <version>1.0</version>
       <auto-deploy>true</auto-deploy>
       <configurations>
@@ -9,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/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/README.md

@@ -0,0 +1,6 @@
+## If you are overriding out-of-the-box Alfresco web scripts, put these files here
+## in the correct org.alfresco... package.
+## If you are defining a new custom web script, add it under
+## resources/alfresco/web-extension/site-webscripts/{your domain path}.
+##
+

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

@@ -0,0 +1,9 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::      Dev environment startup script for Alfresco Community     ::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+@echo off
+
+set MAVEN_OPTS=-Xms256m -Xmx2G
+
+mvnDebug clean install alfresco:run
+

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

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+MAVEN_OPTS="-Xms256m -Xmx2G" mvnDebug clean install alfresco:run

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

@@ -5,82 +5,360 @@
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-    <name>Alfresco Repository and Share Quickstart with database and an embedded Tomcat runner.</name>
-    <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr4, AMPs) in one project
-    </description>
+    <name>AIO - SDK 3.0 Beta</name>
+    <description>All-In-One (AIO) project for SDK 3.0</description>
     <packaging>pom</packaging>
 
-    <parent>
-        <groupId>org.alfresco.maven</groupId>
-        <artifactId>alfresco-sdk-parent</artifactId>
-        <version>@@alfresco.sdk.parent.version@@</version>
-    </parent>
-
-    <!-- 
-       SDK properties have sensible defaults in the SDK parent,
-       but you can override the properties below to use another version.
-       For more available properties see the alfresco-sdk-parent POM.
-       -->
     <properties>
-        <!-- The following are default values for data location, Alfresco Community version, and Records Management Module version.
-             Uncomment if you need to change (Note. current default version for Enterprise edition is @@alfresco.enterprise.default.version@@)
-          <alfresco.version>@@alfresco.community.default.version@@</alfresco.version>
-          <alfresco.rm.version>@@alfresco.rm.version@@</alfresco.rm.version>
-          <alfresco.data.location>alf_data_dev</alfresco.data.location> -->
+        <!-- Alfresco Maven Plugin version to use -->
+        <alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version>
 
-        <!-- This control the root logging level for all apps uncomment and change, defaults to WARN
-            <app.log.root.level>WARN</app.log.root.level>
-        -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <!-- Set the enviroment to use, this controls which properties will be picked in src/test/properties
-             for embedded run, defaults to the 'local' environment. See SDK Parent POM for more info.
+        <!-- Alfresco Data directory, which will contain:
+              Content Store (i.e. the files we upload)
+              Database (i.e. the metadata for the uploaded files)
+              Search index (i.e. the indexed content and metadata)
+             Configured in alfresco-global.properties with the 'dir.root' property.
+              -->
+        <alfresco.data.location>${session.executionRootDirectory}/alf_data_dev</alfresco.data.location>
+
+        <!-- Duplicated with alfresco.solrHome in the plugin, we need them out here to do filtering -->
+        <solr.home>${alfresco.data.location}/solr</solr.home>
+        <solr.model.dir>${solr.home}/alfrescoModels</solr.model.dir>
+        <solr.content.dir>${solr.home}/index</solr.content.dir>
+
+        <!-- Properties used in dependency declarations, you don't need to change these -->
+        <alfresco.groupId>org.alfresco</alfresco.groupId>
+        <alfresco.share.war.artifactId>share</alfresco.share.war.artifactId>
+        <!-- Platform WAR artifact, change to 'alfresco-enterprise' if using Enterprise Edition -->
+        <alfresco.platform.war.artifactId>alfresco-platform</alfresco.platform.war.artifactId>
+
+        <!-- Alfresco Platform and Share webapp versions, these are the original Alfresco webapps that will be
+             customized and then deployed and run by the tomcat maven plugin when
+             executing for example $ mvn clean install alfresco:run -->
+        <alfresco.platform.version>5.2.b-EA</alfresco.platform.version>
+        <alfresco.share.version>5.2.a-EA</alfresco.share.version>
+
+        <!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
+        <alfresco.surf.version>6.6</alfresco.surf.version>
+
+        <!-- Aikau framework version, it is released separately, so it can be useful to be able
+             to bring in newer versions with bug fixes etc -->
+        <aikau.version>1.0.85</aikau.version>
+
+        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
+        <jrebel.version>1.1.6</jrebel.version>
+
+        <!-- Environment to use, Alfresco Maven Plugin will
+             copy alfresco-global-*.properties files from this directory, such as src/test/properties/local -->
         <env>local</env>
-        -->
 
-        <!-- The Alfresco Share web application is accessible via this URL -->
-        <share.client.url>http://localhost:8080/share</share.client.url>
+        <!-- Compile with Java 7, default is 5 -->
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
     </properties>
 
-    <!-- Here we realize the connection with the Alfresco selected platform (e.g.version and edition) -->
     <dependencyManagement>
         <dependencies>
-            <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco plaftorm
-                 (see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies)
-                 NOTE: You still need to define dependencies in your POM, but you can omit version as it's enforced by this dependencyManagement.
-                 NOTE: It defaults to the latest version this SDK pom has been tested with, but alfresco version can/should be overridden in your project's pom
-             -->
+            <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco platform.
+                 NOTE: You still need to define dependencies in your POM, but you can omit version as
+                       it's enforced by this dependencyManagement.
+                 NOTE: It defaults to the latest version this SDK pom has been tested with,
+                       but alfresco version can/should be overridden in your project's pom
+            -->
             <dependency>
                 <groupId>${alfresco.groupId}</groupId>
                 <artifactId>alfresco-platform-distribution</artifactId>
-                <version>${alfresco.version}</version>
+                <version>${alfresco.platform.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Redefine the following Share dependencies as they have different version numbers than platform.
+                 They are defined in alfresco-platform-distribution... -->
+            <dependency>
+                <groupId>${alfresco.groupId}</groupId>
+                <artifactId>${alfresco.share.war.artifactId}</artifactId>
+                <version>${alfresco.share.version}</version>
+                <type>war</type>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>${alfresco.groupId}</groupId>
+                <artifactId>${alfresco.share.war.artifactId}</artifactId>
+                <version>${alfresco.share.version}</version>
+                <classifier>classes</classifier>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>${alfresco.groupId}</groupId>
+                <artifactId>alfresco-web-framework-commons</artifactId>
+                <version>${alfresco.share.version}</version>
+                <classifier>classes</classifier>
+                <scope>provided</scope>
+            </dependency>
+
+            <!-- Redefine the following surf dependencies as they have no resolvable version in the
+                 alfresco-platform-distribution artifact -->
+            <dependency>
+                <groupId>org.alfresco.surf</groupId>
+                <artifactId>spring-surf</artifactId>
+                <version>${alfresco.surf.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco.surf</groupId>
+                <artifactId>spring-surf-api</artifactId>
+                <version>${alfresco.surf.version}</version>
+                <scope>provided</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <!-- Build an AMP if 3rd party libs are needed by the extensions -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.6</version>
+                    <executions>
+                        <execution>
+                            <id>build-amp-file</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                            <configuration>
+                                <appendAssemblyId>false</appendAssemblyId>
+                                <descriptor>src/main/assembly/amp.xml</descriptor>
+                            </configuration>
+                        </execution>
+                    </executions>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.alfresco.maven.plugin</groupId>
+                            <artifactId>alfresco-maven-plugin</artifactId>
+                            <version>${alfresco.sdk.version}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+                <!-- Filter resources in any sub-project with this config -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.0.1</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                        <nonFilteredFileExtensions> <!-- jpg, jpeg, gif, bmp and png are added automatically -->
+                            <nonFilteredFileExtension>ftl</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>acp</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>svg</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>doc</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>docx</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>ppt</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>pptx</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>bin</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>lic</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>swf</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>msg</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>eot</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>css</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>ico</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>psd</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>js</nonFilteredFileExtension>
+                        </nonFilteredFileExtensions>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <!-- Make sure resources in sub-projects are filtered -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
         <plugins>
-            <!-- Compress JavaScript files and store as *-min.js -->
+            <!-- Filter the test resource files in the AIO parent project, and do property substitutions.
+                 We need this config so this is done before the Alfresco Maven Plugin 'run' is executed. -->
             <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.1</version>
+                <inherited>false</inherited>
+                <!-- Run only for the AIO parent Project -->
+                <executions>
+                    <execution>
+                        <id>copy-and-filter-test-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                            <resources>
+                                <testResource>
+                                    <directory>src/test/resources</directory>
+                                    <filtering>true</filtering>
+                                </testResource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--
+                The Alfresco Maven Plugin contains all the logic to run the extension
+                in an embedded Tomcat with the H2 database.
+            -->
+            <plugin>
+                <groupId>org.alfresco.maven.plugin</groupId>
+                <artifactId>alfresco-maven-plugin</artifactId>
+                <version>${alfresco.sdk.version}</version>
+                <configuration>
+                    <!-- Default is to run with a Community edition, change to 'enterprise' if using Enterprise edition -->
+                    <alfrescoEdition>community</alfrescoEdition>
+
+                    <!-- We need the flat file H2 database to run the Repo -->
+                    <enableH2>true</enableH2>
+                    <!-- We always need the Platform/Repo webapp - alfresco.war -->
+                    <enablePlatform>true</enablePlatform>
+                    <!-- Enable Solr webapp so we can use search -->
+                    <enableSolr>true</enableSolr>
+                    <!-- We need Share webapp, so we got a UI for working with the Repo -->
+                    <enableShare>true</enableShare>
+                    <!-- Enable the REST API Explorer -->
+                    <enableApiExplorer>true</enableApiExplorer>
+
+                    <!--
+                        JARs and AMPs that should be overlayed/applied to the Platform/Repository WAR
+                        (i.e. alfresco.war)
+                    -->
+                    <platformModules>
+                        <moduleDependency>
+                            <groupId>${alfresco.groupId}</groupId>
+                            <artifactId>alfresco-share-services</artifactId>
+                            <version>${alfresco.share.version}</version>
+                            <type>amp</type>
+                        </moduleDependency>
+
+                        <!-- Bring in custom Modules -->
+                        <moduleDependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>${artifactId}-platform-jar</artifactId>
+                            <version>${project.version}</version>
+                        </moduleDependency>
+                    </platformModules>
+
+                    <!--
+                        JARs and AMPs that should be overlayed/applied to the Share WAR (i.e. share.war)
+                    -->
+                    <shareModules>
+                        <moduleDependency>
+                            <!-- Bring in a newer version of Aikau, can coexist with older versions in the
+                                WAR distribution, newest version is picked. -->
+                            <groupId>${alfresco.groupId}</groupId>
+                            <artifactId>aikau</artifactId>
+                            <version>${aikau.version}</version>
+                        </moduleDependency>
+
+                        <!-- Bring in custom Modules -->
+                        <moduleDependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>${artifactId}-share-jar</artifactId>
+                            <version>${project.version}</version>
+                        </moduleDependency>
+                    </shareModules>
+                </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>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <!-- Invoke your build with -Prun to run the multimodule project and enable rapid dev mode in your IDE.
-                 See 'run' profile in the sub modules pom.xml for further behavioral details.
-             -->
-            <id>run</id>
-            <properties>
-                <!-- While running in rapid dev mode with -Prun, we don't want amp web resources 
-                    to be added to the war, so we can load them directly from the AMP project (see 
-                    runner/tomcat/context-*.xml for more details) -->
-                <maven.alfresco.includeWebResources>false</maven.alfresco.includeWebResources>
-            </properties>
-        </profile>
-    </profiles>
+    <!--
+        Alfresco Maven Repositories
+        -->
+    <repositories>
+        <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>
+    </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/alfresco-allinone-archetype/src/main/resources/archetype-resources/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/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/webscript.get.html.ftl

@@ -1 +0,0 @@
-Message: ${message}

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

@@ -1 +0,0 @@
-model["message"] = "Hello World!";

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/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/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/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/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/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/repo/pom.xml

@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-    
-<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 WAR Aggregator</name>
-    <packaging>war</packaging>
-    <description>Alfresco Repository aggregator, installs your repository AMPs in the Alfresco WAR for aggregation and easy deployment purposes</description>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
-        <version>${version}</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>${alfresco.repo.artifactId}</artifactId>
-            <version>${alfresco.version}</version>
-            <type>war</type>
-        </dependency>
-        <!-- Demonstrating the dependency / installation of the repo AMP developed in the 'repo-amp' module -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>repo-amp</artifactId>
-            <version>${project.version}</version>
-            <type>amp</type>
-        </dependency>
-        <!-- Uncomment if you are using SPP (SharePoint Protocol Support) for Online Edit etc -->
-        <!--
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-spp</artifactId>
-            <version>${alfresco.version}</version>
-            <type>amp</type>
-        </dependency>
-        -->
-        <!-- Uncomment if you are using the RM (Records Management) module. -->
-        <!--
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-rm</artifactId>
-            <version>${alfresco.rm.version}</version>
-            <type>amp</type>
-        </dependency>
-        -->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <!--  Here is can control the order of overlay of your (WAR, AMP, etc.) dependencies
-                        | NOTE: At least one WAR dependency must be uncompressed first
-                        | NOTE: In order to have a dependency effectively added to the WAR you need to 
-                        | explicitly mention it in the overlay section.
-                        | NOTE: First-win resource strategy is used by the WAR plugin
-                         -->
-                    <overlays>
-                        <!-- Current project customizations. This is normally empty, since customizations come from the AMPs -->
-                        <overlay/>
-                        <!-- The Alfresco WAR -->
-                        <overlay>
-                            <groupId>${alfresco.groupId}</groupId>
-                            <artifactId>${alfresco.repo.artifactId}</artifactId>
-                            <type>war</type>
-                            <!-- To allow inclusion of META-INF -->
-                            <excludes/>
-                        </overlay>
-                        <!-- Add / sort your AMPs here -->
-                        <overlay>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>repo-amp</artifactId>
-                            <type>amp</type>
-                        </overlay>
-                        <!-- Uncomment if you are using SPP -->
-                        <!--
-                        <overlay>
-                            <groupId>${alfresco.groupId}</groupId>
-                            <artifactId>alfresco-spp</artifactId>
-                            <type>amp</type>
-                        </overlay>
-                        -->
-                        <!-- Uncomment if you are using RM -->
-                        <!--
-                        <overlay>
-                            <groupId>${alfresco.groupId}</groupId>
-                            <artifactId>alfresco-rm</artifactId>
-                            <type>amp</type>
-                        </overlay>
-                        -->
-                    </overlays>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <!-- Overrides the run profile to disable securecomms and add rapid development configuration -->
-        <profile>
-            <id>run</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>prepare-exploded-war</id>
-                                <goals>
-                                    <goal>exploded</goal>
-                                </goals>
-                                <phase>prepare-package</phase>
-                            </execution>
-                            <execution>
-                                <id>default-war</id>
-                                <configuration>
-                                    <webXml>${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/web.xml</webXml>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- Replaces web.xml where applicable, commenting out the security-constraints -->
-                    <plugin>
-                        <groupId>com.google.code.maven-replacer-plugin</groupId>
-                        <artifactId>replacer</artifactId>
-                        <executions>
-                            <execution>
-                                <id>disable-securecomms</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>replace</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <ignoreErrors>true</ignoreErrors>
-                            <file>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</file>
-                            <outputDir>${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/</outputDir>
-                            <preserveDir>false</preserveDir>
-                            <replacements>
-                                <replacement>
-                                    <token><![CDATA[<!-- Toggle securecomms placeholder start -->]]></token>
-                                    <value><![CDATA[<!--]]></value>
-                                </replacement>
-                                <replacement>
-                                    <token><![CDATA[<!-- Toggle securecomms placeholder end -->]]></token>
-                                    <value><![CDATA[-->]]></value>
-                                </replacement>
-                            </replacements>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.alfresco.maven</groupId>
-                    <artifactId>alfresco-rad</artifactId>
-                    <version>${maven.alfresco.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/src/main/resources/alfresco/extension/dev-log4j.properties

@@ -1,2 +0,0 @@
-# You can add here custom log4j classes. This will be merged with the main log4j.properties
-# See http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module#Best_Log4j_Configuration_Practices

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

@@ -3,13 +3,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 @echo off
 
-set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\@@springloaded.version@@\springloaded-@@springloaded.version@@.jar
+set MAVEN_OPTS=-Xms256m -Xmx2G
 
-if not exist %springloadedfile% (
-  mvn validate -Psetup
-)
+mvn clean install alfresco:run
 
-set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G
-
-mvn install -Prun -nsu
-:: mvn install -Prun 

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

@@ -1,9 +1,3 @@
 #!/bin/bash
-# Downloads the spring-loaded lib if not existing and runs the full all-in-one
-# (Alfresco + Share + Solr) using the runner project
-springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloaded.version@@/springloaded-@@springloaded.version@@.jar
 
-if [ ! -f $springloadedfile ]; then
-mvn validate -Psetup
-fi
-MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn install -Prun
+MAVEN_OPTS="-Xms256m -Xmx2G" mvn clean install alfresco:run

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

@@ -1,420 +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 and Solr4 Tomcat Runner</name>
-    <packaging>pom</packaging>
-    <description>Alfresco, Share and Solr4 Tomcat Runner</description>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
-        <version>${version}</version>
-    </parent>
-
-    <profiles>
-        <profile>
-            <id>run</id>
-
-            <!-- TODO: figure out a way to define these properties in a parent POM, they are now also duplicated
-                       in the solr-config/pom.xml -->
-            <properties>
-                <alfresco.solr.dir>${project.parent.basedir}/${alfresco.data.location}/solr4</alfresco.solr.dir>
-                <alfresco.solr.home.dir>${alfresco.solr.dir}/config</alfresco.solr.home.dir>
-            </properties>
-
-            <build>
-                <plugins>
-                    <!-- Copy and filter webapp context files - output dir is runner/target/contexts -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-tomcat-resources</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${project.build.directory}/contexts</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>tomcat</directory>
-                                            <filtering>true</filtering>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- Run Tomcat 7 embedded with Alfresco.war and Share.war contexts.
-                         The solr4.war is fetched directly from the Maven repo, it is not built like the other WARs.
-                         Plugin version is picked up from alfresco-sdk-parent.pom pluginManagement definition,
-                         which also brings in the H2 database lib -->
-                    <plugin>
-                        <groupId>org.apache.tomcat.maven</groupId>
-                        <artifactId>tomcat7-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>run-wars</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <phase>pre-integration-test</phase>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <ignorePackaging>true</ignorePackaging>
-                            <!-- Make sure Catalina classes are picked up when we got virtual webapp contexts with classpaths -->
-                            <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-                            <path>/</path>
-                            <systemProperties>
-                                <solr.solr.home>${alfresco.solr.home.dir}</solr.solr.home>
-                            </systemProperties>
-                            <!-- Should this class loader delegate to the parent class loader before searching its
-                                 own repositories (i.e. the usual Java2 delegation model) -->
-                            <!-- Prevent parent classloader delegation, each webapp loads.
-                                 If set to true then you will get a truckload of Solr logging as
-                                 the alf_data_dev/solr4/config/log4j-solr.properties file is not picked up.
-                                 This also fixes issues with the Google Guava Library, which this tomcat plugin uses
-                                 version 10.0.1 of but Solr uses 14.0.1 -->
-                            <delegate>false</delegate>
-                            <webapps>
-                                <webapp>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>repo</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>war</type>
-                                    <!-- Make sure webapp is loaded with context and everything,
-                                         if set to 'false' then you will get 404 when trying to access the webapp from browser -->
-                                    <asWebapp>true</asWebapp>
-                                    <contextPath>/alfresco</contextPath>
-                                    <contextFile>${project.build.directory}/contexts/context-repo.xml</contextFile>
-                                </webapp>
-                                <webapp>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>share</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>war</type>
-                                    <asWebapp>true</asWebapp>
-                                    <contextPath>/share</contextPath>
-                                    <contextFile>${project.build.directory}/contexts/context-share.xml</contextFile>
-                                </webapp>
-                                <webapp>
-                                    <groupId>${alfresco.groupId}</groupId>
-                                    <artifactId>alfresco-solr4</artifactId>
-                                    <version>${alfresco.version}</version>
-                                    <type>war</type>
-                                    <asWebapp>true</asWebapp>
-                                    <contextPath>/solr4</contextPath>
-                                    <contextFile>${project.build.directory}/contexts/context-solr.xml</contextFile>
-                                </webapp>
-                            </webapps>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <!-- Runs Share User Interface regression tests using Alfresco Share PO (Page Object) vanilla Selenium / Webdrone (WebDriver wrapper).
-             NOTE: Assumes an already running Alfresco + Share at the default location ${share.client.url}
-             (e.g. by invoking:
-                        $ mvn clean install -Prun,regression-testing
-                   to run a specific test do:
-                        $ mvn clean install -Prun,regression-testing -Dit.test=LoginPageTest
-              -->
-        <profile>
-            <id>regression-testing</id>
-            <properties>
-                <!-- Re-configure Tomcat 7 Plugin (see run profile) to fork so we can run tests in parallel -->
-                <!-- Note. the fork option does not fork a new JVM. Rather it is run in a thread created by the
-                     Maven Launcher class (org.codehaus.plexus.classworlds.launcher.Launcher) that is invoked by the mvn command. -->
-                <maven.tomcat.fork>true</maven.tomcat.fork>
-
-                <!-- Make sure we are actually testing something -->
-                <skipTests>false</skipTests>
-            </properties>
-            <build>
-                <plugins>
-                    <!-- Need to unpack the tests becuase of Jiras: -->
-                    <!-- https://jira.codehaus.org/browse/SUREFIRE-997 -->
-                    <!-- https://jira.codehaus.org/browse/SUREFIRE-1024 -->
-                    <!-- Workaround for classloading issue in share-po (need to unpack it)-->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>prepare-regression-test-resources</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifact>${alfresco.groupId}:share-po:${alfresco.version}:jar:tests</artifact>
-                                    <outputDirectory>${project.build.directory}/testng-resources</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.18.1</version>
-                        <configuration>
-                            <suiteXmlFiles>
-                                <!-- Smaller test suite for Share, essential stuff like Login, Navigation, DocLib, and Search -->
-                                <!-- Currently using our own config to be able to comment out one test class
-                                    <suiteXmlFile>${project.build.directory}/testng-resources/testng-alfresco-share.xml</suiteXmlFile> -->
-                                <suiteXmlFile>${project.basedir}/test-ng/testng-alfresco-share.xml</suiteXmlFile>
-                            </suiteXmlFiles>
-                            <testClassesDirectory>${project.build.directory}/testng-resources</testClassesDirectory>
-                            <systemPropertyVariables>
-                                <!-- Where is the Alfresco Share Webapp that we are testing -->
-                                <share.target>${share.client.url}</share.target>
-                            </systemPropertyVariables>
-
-                            <!-- The out-of-the-box Alfresco Share PO test classes does not follow the *IT.java
-                                 naming convention, they use *Test.java, so need to add that -->
-                            <includes>
-                                <include>**/*Test.java</include>
-                            </includes>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>regression-tests</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>verify-tests</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-
-            <dependencies>
-                <!-- Bring in the Share Page Objects (PO) used in the regression tests -->
-                <dependency>
-                    <groupId>${alfresco.groupId}</groupId>
-                    <artifactId>share-po</artifactId>
-                    <version>${alfresco.version}</version>
-                    <scope>test</scope>
-
-                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
-                       version 2.45 later on here in this profile -->
-                    <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>
-                <!-- Bring in the Share Page Object (PO) regression tests that comes with Alfresco.
-                     These tests cover the Alfresco Share Web Application -->
-                <dependency>
-                    <groupId>${alfresco.groupId}</groupId>
-                    <artifactId>share-po</artifactId>
-                    <version>${alfresco.version}</version>
-                    <classifier>tests</classifier>
-                    <scope>test</scope>
-
-                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
-                       version 2.45 later on here in this profile -->
-                    <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>
-
-                <!-- Make sure we are running with newer selenium that works with newest FF (newer than 2.39.0) -->
-                <dependency>
-                    <groupId>org.seleniumhq.selenium</groupId>
-                    <artifactId>selenium-java</artifactId>
-                    <version>2.45.0-alfresco</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.seleniumhq.selenium</groupId>
-                    <artifactId>selenium-server</artifactId>
-                    <version>2.45.0-alfresco</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.mortbay.jetty</groupId>
-                            <artifactId>servlet-api-2.5</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>
-        </profile>
-
-        <!-- Runs functional domain specific tests using Alfresco Share PO (Page Object) vanilla Selenium / Webdrone (WebDriver wrapper).
-             NOTE: Assumes an already running Alfresco + Share at the default location ${share.client.url}
-             (e.g. by invoking:
-                        $ mvn clean install -Prun,functional-testing
-                   to run a specific test do:
-                        $ mvn clean install -Prun,functional-testing -Dit.test=DemoPageTestIT
-              -->
-        <profile>
-            <id>functional-testing</id>
-            <properties>
-                <!-- Re-configure Tomcat 7 Plugin (see run profile) to fork so we can run tests in parallel -->
-                <!-- Note. the fork option does not fork a new JVM. Rather it is run in a thread created by the
-                     Maven Launcher class (org.codehaus.plexus.classworlds.launcher.Launcher) that is invoked by the mvn command. -->
-                <maven.tomcat.fork>true</maven.tomcat.fork>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.18.1</version>
-                        <configuration>
-                            <suiteXmlFiles>
-                                <suiteXmlFile>${project.parent.basedir}/share-amp/target/test-classes/testng.xml</suiteXmlFile>
-                            </suiteXmlFiles>
-                            <testClassesDirectory>${project.parent.basedir}/share-amp/target/test-classes</testClassesDirectory>
-                            <systemPropertyVariables>
-                                <!-- Where is the Alfresco Share Webapp that we are testing -->
-                                <share.target>${share.client.url}</share.target>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>functional-tests</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>verify-tests</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <dependencies>
-                <!-- Bring in the Share Page Objects (PO) used in our functional tests.
-                     Without it TestNG cannot load our test class when it uses page objects such as LoginPage -->
-                <dependency>
-                    <groupId>${alfresco.groupId}</groupId>
-                    <artifactId>share-po</artifactId>
-                    <version>${alfresco.version}</version>
-                    <scope>test</scope>
-
-                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
-                       version 2.45 later on here in this profile -->
-                    <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>
-
-                <!-- 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.
-                     Without it TestNG cannot load our test class -->
-                <dependency>
-                    <groupId>${alfresco.groupId}</groupId>
-                    <artifactId>share-po</artifactId>
-                    <version>${alfresco.version}</version>
-                    <classifier>tests</classifier>
-                    <scope>test</scope>
-
-                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
-                       version 2.45 later on here in this profile -->
-                    <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>
-
-                <!-- Make sure we are running with newer selenium that works with newest FF (newer than 2.39.0) -->
-                <dependency>
-                    <groupId>org.seleniumhq.selenium</groupId>
-                    <artifactId>selenium-java</artifactId>
-                    <version>2.45.0-alfresco</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.seleniumhq.selenium</groupId>
-                    <artifactId>selenium-server</artifactId>
-                    <version>2.45.0-alfresco</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.mortbay.jetty</groupId>
-                            <artifactId>servlet-api-2.5</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>
-        </profile>
-
-    </profiles>
-</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/src/main/webapp/index.html

@@ -1,24 +0,0 @@
-<html>
-	<head>
-		<title>Alfresco SDK @@alfresco.sdk.parent.version@@ - Running Alfresco ${alfresco.version}</title>
-	</head>
-	<body style="font: 13px/1.231 Open Sans,arial,helvetica,clean,sans-serif;">
-		<img alt="Maven Alfresco SDK" src="https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg">
-		<p>Congratulations, you are successfully running the <a href="https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/archetypes/alfresco-allinone-archetype/index.html">All in One project from the <a href="https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html">Alfresco SDK @@alfresco.sdk.parent.version@@</a>, powered by <a href="http://maven.apache.org/">Apache Maven</a>!
-		<br/>
-		You can access the Alfresco components running embedded below:</p>
-		<ul>
-			<li><a href="/share">Alfresco Share</a></li>
-			<li><a href="/alfresco">Alfresco Repository</a></li>
-			<li><a href="/solr4">Alfresco Solr4</a></li>
-		</ul>
-		<p><b>Resources:</b></p>
-		<ul>
-			<li><a href="http://docs.alfresco.com">Alfresco Documentation</a></li>
-			<li><a href="https://support.alfresco.com">Alfresco Enterprise Support portal</a></li>
-			<li><a href="https://github.com/Alfresco/alfresco-sdk/fork">Fork and contribute to this SDK!</a></li>
-			<li><a href="https://issues.alfresco.com/jira/browse/ALF">Report an Alfresco issue</a></li>
-			<li><a href="https://github.com/Alfresco/alfresco-sdk/issues/new">Report an SDK issue</a></li>
-		</ul>
-	</body>
-</html>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/test-ng/testng-alfresco-share.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite thread-count="1" parallel="tests" preserve-order="true" verbose="6" name="Alfresco Share UI Basic Regression Test">
-    <groups>
-        <run>
-            <include name="unit"/>
-            <include name="alfresco-one"/>
-            <exclude name=".*Bug42"/>
-            <exclude name=".*Bug"/>
-            <exclude name="chromeOnly"/>
-            <exclude name="Hybrid"/>
-            <exclude name="download"/>
-            <exclude name="communityIssue"/>
-        </run>
-    </groups>
-    <test name="LoginPageTest">
-        <classes>
-            <class name="org.alfresco.po.share.LoginPageTest" />
-        </classes>
-    </test>
-    <test name="NavigationBarTest">
-        <classes>
-            <class name="org.alfresco.po.share.NavigationBarTest" />
-        </classes>
-    </test>
-    <test name="LiveSearchDropdownTest">
-        <classes>
-            <class name="org.alfresco.po.share.search.LiveSearchDropdownTest" />
-        </classes>
-    </test>
-    <test name="FacetedSearchResultsPageTest">
-        <classes>
-            <class name="org.alfresco.po.share.search.FacetedSearchResultsPageTest" />
-        </classes>
-    </test>
-    <test name="DocumentDetailsPageTest">
-        <classes>
-            <class name="org.alfresco.po.share.site.document.DocumentDetailsPageTest"/>
-        </classes>
-    </test>
-    <!-- TODO: fix this, currently does not work
-    <test name="DocumentLibraryPageTest">
-        <classes>
-            <class name="org.alfresco.po.share.site.document.DocumentLibraryPageTest"/>
-        </classes>
-    </test>
-    -->
-    <test name="FileDirectoryInfoTest">
-        <classes>
-            <class name="org.alfresco.po.share.site.document.FileDirectoryInfoTest">
-                <methods>
-                    <!-- these currently take longer than 60 seconds for page rendering... -->
-                    <exclude name="test107TagsForFolder" />
-                    <exclude name="test114TagsForFile" />
-                </methods>
-            </class>
-        </classes>
-    </test>
-    <test name="FolderDetailsPageTest">
-        <classes>
-            <class name="org.alfresco.po.share.site.document.FolderDetailsPageTest"/>
-        </classes>
-    </test>
-    <test name="ManagePermissionsTest">
-        <classes>
-            <class name="org.alfresco.po.share.site.document.ManagePermissionsTest"/>
-        </classes>
-    </test>
-    <test name="InviteMembersPageTest">
-        <classes>
-            <class name="org.alfresco.po.share.site.InviteMembersPageTest" />
-        </classes>
-    </test>
-    <test name="SiteFinderPageTest">
-        <classes>
-            <class name="org.alfresco.po.share.site.SiteFinderPageTest" />
-        </classes>
-    </test>
-</suite>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================================================================
-    This context file is used only in a development IDE for rapid development,
-    it is never released with the Alfresco.war
-
-    IMPORTANT: If an AMP or JAR extension is added to the Alfresco WAR,
-              then you need to add the paths below for this new extension.
-    =================================================================================================================-->
-
-<!-- Pick up static resource files from ../repo/target/repo.
-     The Alfresco.war 5.0 does not have a webapp (it used to have Alfresco Explorer but not anymore)
-     that we will access, so this docBase might not be needed -->
-<Context docBase="${project.parent.basedir}/alfresco-war/target/${project.build.finalName}">
-    <!-- Pick up static resource files from AMPs and other directories (this should not include docBase) -->
-    <Resources className="org.apache.naming.resources.VirtualDirContext"
-               extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" />
-
-    <!-- Configure where the Alfresco (alfresco.war) web application can load classes, test classes, and config files -->
-    <!-- Setup the virtual class path like this:
-         1) target/classes
-         2) target/${project.build.finalName}/config
-         3) target/test-classes
-
-         This way mvn compile can be invoked and all changes will be picked up
-    -->
-    <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
-            searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;${project.parent.basedir}/repo-amp/target/repo-amp/config;${project.parent.basedir}/repo-amp/target/test-classes" />
-
-    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
-    <JarScanner scanAllDirectories="true" />
-</Context>
-
-
-    

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================================================================
-    This context file is used only in a development IDE for rapid development,
-    it is never released with the Share.war
-
-    IMPORTANT: If an AMP or JAR extension is added to the Share WAR,
-               then you need to add the paths below for this new extension.
-=================================================================================================================-->
-<Context>
-    <!-- Pick up static resource files from any Share extensions, being it a JAR or an AMP
-         (this should not include docBase) -->
-    <Resources className="org.apache.naming.resources.VirtualDirContext"
-               extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
-
-    <!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
-    <!-- Setup the virtual class path like this:
-         1) target/classes
-         2) target/${project.build.finalName}/config
-         3) target/test-classes
-
-         This way mvn compile can be invoked and all changes will be picked up
-    -->
-    <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
-            searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/share-amp/config;${project.parent.basedir}/share-amp/target/test-classes" />
-
-    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
-    <JarScanner scanAllDirectories="true" />
-</Context>
-
-
-

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-solr.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Context>
-    <Environment name="solr/home"        type="java.lang.String" value="${project.parent.basedir}/alf_data_dev/solr4/config/" override="true"/>
-    <Environment name="solr/model/dir"   type="java.lang.String" value="${project.parent.basedir}/alf_data_dev/solr4/config/alfrescoModels/" override="true"/>
-    <Environment name="solr/content/dir" type="java.lang.String" value="${project.parent.basedir}/alf_data_dev/solr4/data/content/" override="true"/>
-
-    <!-- Pick up static resource files from any Solr extensions, being it a JAR or an AMP,
-         by default there are no extensions, just the standard Solr webapp files.
-         (this should not include docBase)-->
-    <Resources className="org.apache.naming.resources.VirtualDirContext"
-               extraResourcePaths="/=${project.parent.basedir}/runner/target/tomcat/webapps/alfresco-solr4" />
-
-    <!-- Configure where the Solr (solr4.war) web application can load classes, test classes, and config -->
-    <!-- Solr is not customized by default so just points to standard Solr classes. -->
-    <!-- Setup the virtual class path like this:
-         1) target/classes
-         3) target/test-classes
-
-         This way mvn compile can be invoked and all changes will be picked up-->
-
-    <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
-            searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/runner/target/tomcat/webapps/alfresco-solr4/WEB-INF/classes" />
-
-    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
-    <JarScanner scanAllDirectories="true" />
-</Context>

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

@@ -1,109 +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>
-
-        <!-- Used in share-config-custom.xml. By default points to standard location of Alfresco Repository -->
-        <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
-
-        <!-- 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 -->
-        <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 version 2.39.0 of selenium that does not work with latest FF browsers, we include
-               version 2.45 later on here -->
-            <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>
-        <!-- Bring in newer selenium version -->
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>2.45.0-alfresco</version>
-        </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/share-amp/src/main/amp/config/alfresco/messages/custom.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/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md

@@ -1,4 +0,0 @@
-## If you are overriding out-of-the-box Alfresco web scripts put these files here.
-## If you are defining new web scripts add them under resources/alfresco/site-webscripts.
-##
-

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/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/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/share-amp/src/test/java/demoamp/DemoPageTestIT.java

@@ -1,92 +0,0 @@
-#set($symbol_pound='#')
-#set($symbol_dollar='$')
-#set($symbol_escape='\' )
-/*
- * Copyright (C) 2005-2015 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.AbstractTest;
-import org.alfresco.po.share.LoginPage;
-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
-        drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page");
-        // Reuse Alfresco Share login page object from share-po lib.
-        LoginPage loginPage = new LoginPage(drone);
-        loginPage.loginAs(username, password);
-    }
-
-    @BeforeMethod
-    public void loadPage() {
-        // Goto demo page
-        drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page");
-        page = new DemoPage(drone);
-    }
-
-    @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 peoppleFinderPage = page.getNav().selectPeople().render();
-        Assert.assertNotNull(peoppleFinderPage);
-    }
-}

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

@@ -1,88 +0,0 @@
-#set($symbol_pound='#')
-#set($symbol_dollar='$')
-#set($symbol_escape='\' )
-/*
- * Copyright (C) 2005-2015 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.webdrone.RenderTime;
-import org.alfresco.webdrone.WebDrone;
-import org.openqa.selenium.By;
-import org.openqa.selenium.NoSuchElementException;
-
-/**
- * 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 {
-    private By SIMPLE_DEMO_LOGO = By.id("DEMO_SIMPLE_LOGO");
-    private By SIMPLE_DEMO_MESSAGE = By.id("DEMO_SIMPLE_MSG");
-
-    public DemoPage(WebDrone drone) {
-        super(drone);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public DemoPage render() {
-        return render(new RenderTime(maxPageLoadingTime));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public DemoPage render(RenderTime timer) {
-        while (true) {
-            timer.start();
-            try {
-                if (isSimpleLogoDisplayed() && isMessageDisplayed()) {
-                    break;
-                }
-            } catch (NoSuchElementException nse) {
-            } finally {
-                timer.end();
-            }
-        }
-        return this;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public DemoPage render(long time) {
-        return render(new RenderTime(time));
-    }
-
-    public boolean isSimpleLogoDisplayed() {
-        try {
-            return drone.find(SIMPLE_DEMO_LOGO).isDisplayed();
-        } catch (NoSuchElementException se) {
-        }
-        return false;
-    }
-
-    public boolean isMessageDisplayed() {
-        try {
-            return drone.find(SIMPLE_DEMO_MESSAGE).isDisplayed();
-        } catch (NoSuchElementException se) {
-        }
-        return false;
-    }
-
-    public String getMessage() {
-        return drone.find(SIMPLE_DEMO_MESSAGE).getText();
-    }
-}

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