Merge branch 'develop' into stable

amp-plugin to v1.0.6 [fix dependency inclusion]
2021-10-29 10:02:51 -04:00 · 2021-10-29 10:02:27 -04:00 · 2021-10-28 17:24:54 -04:00 · 2021-10-28 17:24:36 -04:00 · 2021-10-28 16:59:16 -04:00 · 2021-10-28 16:59:07 -04:00
154 changed files with 3702 additions and 1748 deletions
--- a/README.md
+++ b/README.md
@@ -73,50 +73,61 @@ The following components are useful to users of the BeeDK.

 | Component                             | Folder Link   | Details |
 | ------------------------------------- | ------------- | ------- |
-| `beedk-acs-platform-module-tile`      | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-module-tile)      | Intended to be inherited by all Alfresco Platform module projects; Includes ampification, integration testing framework, and more. |
-| `beedk-acs-share-module-tile`         | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-module-tile)         | Intended to be inherited by all Alfresco Share module projects; Includes ampification, JS compression, integration testing framework, and more. |
-| `beedk-acs-platform-webapp-tile`      | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-webapp-tile)      | Intended to be inherited by all Alfresco Platform web application projects; Includes installing AMPs, integration testing framework, and more. |
-| `beedk-acs-share-webapp-tile`         | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-webapp-tile)         | Intended to be inherited by all Alfresco Share web application projects; Includes installing AMPs, integration testing framework, and more. |
+| `beedk-acs-platform-module-tile`      | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-module-tile)      | Intended to be inherited by all Alfresco Platform module projects; Includes ampification and more. |
+| `beedk-acs-share-module-tile`         | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-module-tile)         | Intended to be inherited by all Alfresco Share module projects; Includes ampification, JS compression, and more. |
+| `beedk-acs-platform-webapp-tile`      | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-webapp-tile)      | Intended to be inherited by all Alfresco Platform web application projects; Includes installing AMPs, and more. |
+| `beedk-acs-share-webapp-tile`         | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-webapp-tile)         | Intended to be inherited by all Alfresco Share web application projects; Includes installing AMPs, and more. |
 | `beedk-ate-springboot`                | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ate-springboot) | Intended to be inherited by all Alfresco Transform Engine Spring Boot projects; Includes dependencies. |
 | `beedk-ate-springboot-test`           | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ate-springboot-test) | Intended to be inherited by all Alfresco Transform Engine Spring Boot projects; Includes dependencies. |
 | `beedk-ate-springboot-tile`           | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ate-springboot-tile) | Intended to be inherited by all Alfresco Transform Engine Spring Boot projects; Includes Spring Boot repackaging and more. |
-| `beedk-aps-ext-tile`                  | *Coming Soon* | Intended to be inherited by all Alfresco Process Service extension projects; Includes integration testing framework and more. |
-| `beedk-flowable-ext-tile`             | *Coming Soon* | Intended to be inherited by all Flowable extension projects; Includes integration testing framework and more. |
-| `beedk-camunda-ext-tile`              | *Coming Soon* | Intended to be inherited by all Camunda extension projects; Includes integration testing framework and more. |
+| `beedk-activiti-ext-tile`             | *Coming Soon* | Intended to be inherited by all Alfresco Process Services or Activiti extension projects. |
+| `beedk-flowable-ext-tile`             | *Coming Soon* | Intended to be inherited by all Flowable extension projects. |
+| `beedk-camunda-ext-tile`              | *Coming Soon* | Intended to be inherited by all Camunda extension projects. |

 #### ACS Platform Accessories

 | Component                             | Folder Link   | Details |
 | ------------------------------------- | ------------- | ------- |
 | `beedk-acs-platform-docker-tile`      | *Coming Soon* | Intended to be inherited by any project that already includes a `beedk-acs-platform-webapp-tile` Maven Tile and wants to deliver a Docker image; Includes building and publishing the container images and more. |
-| `beedk-acs-platform-sibling-it-tile`  | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-sibling-it-tile) | Intended to be inherited by any Maven project that has a sibling Alfresco Platform module or web application Maven project.  It enables integration testing with the sibling ACS Platform.  This is great for ACS Share modules, ACS Share web applications, custom Alfresco Transform Engines, and APS extensions in **all-in-one** style Maven projects. |
-| `beedk-acs-platform-artifact-it-tile` | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-artifact-it-tile) | Intended to be inherited by any Maven project that does not have a sibling Alfresco Platform module or web application Maven project.  It enables integration testing with any ACS Platform as an already built Maven Artifact.  This is great for ACS Share modules, ACS Share web applications, custom Alfresco Transform Engines, APS extensions, and non-Alfresco applications in **standalone** projects. |
-| `beedk-acs-search-it-tile`            | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-it-tile)            | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-tile` Maven Tile.  It enables integration testing of the ACS Platform with the Alfresco Search Services enabled.  This is great for any project requiring non-transactional search functionality for integration testing purposes. |
-| `beedk-acs-lts-it-tile`               | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-it-tile)               | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-tile` Maven Tile.  It enables integration testing of the ACS Platform with the Local Transform Service and the AIO Transform Engine enabled.  This is great for any project requiring basic transformation functionality for integration testing purposes. |
-| `beedk-ats-it-tile`                   | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ats-it-tile)                   | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-tile` Maven Tile.  It enables integration testing of the ACS Platform with the Alfresco Transform Service (ATS) enabled.  This is great for any project requiring Alfresco Enterprise transformation functionality for integration testing purposes. |
-| `beedk-ate-it-tile`                   | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ate-it-tile)                   | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-tile` Maven Tile.  It enables integration testing of the ACS Platform with a specific Alfresco Transform Engine (ATE) enabled.  This is great for any project requiring custom Alfresco transformation functionality for integration testing purposes. |
+| `beedk-acs-platform-self-it-tile`     | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-it-tile) | Intended to be inherited by any ACS Platform module or web application Maven project.  It enables integration testing with the ACS Platform. |
+| `beedk-acs-platform-sibling-it-tile`  | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-sibling-it-tile) | Intended to be inherited by any Maven project that has a sibling ACS Platform module or web application Maven project.  It enables integration testing with the sibling ACS Platform.  This is great for ACS Share modules, ACS Share web applications, custom Alfresco Transform Engines, and APS extensions in **all-in-one** style Maven projects. |
+| `beedk-acs-platform-artifact-it-tile` | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-artifact-it-tile) | Intended to be inherited by any Maven project that does not have a sibling ACS Platform module or web application Maven project.  It enables integration testing with any ACS Platform as an already built Maven Artifact.  This is great for ACS Share modules, ACS Share web applications, custom Alfresco Transform Engines, APS extensions, and non-Alfresco applications in **standalone** projects. |
+| `beedk-acs-search-it-tile`            | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-it-tile) | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-it-tile` Maven Tile.  It enables integration testing of the ACS Platform with the Alfresco Search Services enabled.  This is great for any project requiring non-transactional search functionality for integration testing purposes. |
+| `beedk-acs-lts-it-tile`               | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-it-tile) | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-it-tile` Maven Tile.  It enables integration testing of the ACS Platform with the Local Transform Service and the AIO Transform Engine enabled.  This is great for any project requiring basic transformation functionality for integration testing purposes. |
+| `beedk-ats-it-tile`                   | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ats-it-tile) | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-it-tile` Maven Tile.  It enables integration testing of the ACS Platform with the Alfresco Transform Service (ATS) enabled.  This is great for any project requiring Alfresco Enterprise transformation functionality for integration testing purposes. |
+| `beedk-ate-it-tile`                   | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ate-it-tile) | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-it-tile` Maven Tile.  It enables integration testing of the ACS Platform with a specific Alfresco Transform Engine (ATE) enabled.  This is great for any project requiring custom Alfresco transformation functionality for integration testing purposes. |

 #### ACS Share Accessories

 | Component                             | Folder Link   | Details |
 | ------------------------------------- | ------------- | ------- |
 | `beedk-acs-share-docker-tile`         | *Coming Soon* | Intended to be inherited by any project that already includes a `beedk-acs-share-webapp-tile` Maven Tile and wants to deliver a Docker image; Includes building and publishing the container images and more. |
+| `beedk-acs-share-self-it-tile`        | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-self-it-tile) | Intended to be inherited by any ACS Share module or web application Maven project.  It enables integration testing with ACS Share. |

-#### ACS Share Accessories
+#### Alfresco Transform Engine Accessories

 | Component                             | Folder Link   | Details |
 | ------------------------------------- | ------------- | ------- |
-| `beedk-ate-docker-tile`               | *Coming Soon* | Intended to be inherited by any project that already includes a `beedk-ate-app-tile` tile and wants to deliver a Docker image. |
+| `beedk-ate-docker-tile`               | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ate-docker-tile) | Intended to be inherited by any project that already includes a `beedk-ate-springboot-tile` tile and wants to deliver a Docker image. |
+
+#### Other Accessories
+
+| Component                             | Folder Link   | Details |
+| ------------------------------------- | ------------- | ------- |
+| `beedk-springboot-docker-tile`        | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-springboot-docker-tile) | Intended to be inherited by any Spring Boot project that wants to deliver a Docker image. |

 #### Rapid Application Development

 | Component                              | Folder Link   | Details |
 | -------------------------------------- | ------------- | ------- |
 | `beedk-acs-platform-self-rad-tile`     | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-rad-tile) | Intended to be inherited by any Alfresco Platform module or web application projects; Includes startup with partial hot reloading. |
-| `beedk-acs-platform-sibling-rad-tile`  | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-sibling-rad-tile) | Intended to be inherited by any Maven project that has a sibling Alfresco Platform module or web application Maven project; Includes simple startup to assist with development. |
-| `beedk-acs-platform-artifact-rad-tile` | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-artifact-rad-tile) | Intended to be inherited by any Maven project that wants to use the Alfresco Platform web application; Includes simple startup to assist with development. |
+| `beedk-acs-platform-sibling-rad-tile`  | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-sibling-rad-tile) | Intended to be inherited by any Maven project that has a sibling Alfresco Platform module or web application Maven project; provides ACS Platform capability to other RAD components. |
+| `beedk-acs-platform-artifact-rad-tile` | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-artifact-rad-tile) | Intended to be inherited by any Maven project that wants to use the Alfresco Platform web application; provides ACS Platform capability to other RAD components. |
 | `beedk-acs-share-self-rad-tile`        | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-self-rad-tile) | Intended to be inherited by any Alfresco Platform module or web application projects; Includes startup with partial hot reloading. |
-| `beedk-ate-rad-tile`                   | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ate-rad-tile) | Intended to be inherited by any Alfresco Transform Engine projects; Includes startup with partial hot reloading. |
+| `beedk-acs-search-rad-tile`            | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-rad-tile) | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-rad-tile` Maven Tile.  It enables RAD of the ACS Platform with the Alfresco Search Services enabled.  This is great for any project requiring non-transactional search functionality. |
+| `beedk-acs-lts-rad-tile`               | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-rad-tile) | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-rad-tile` Maven Tile.  It enables RAD of the ACS Platform with the Local Transform Service and the AIO Transform Engine enabled.  This is great for any project requiring basic transformation functionality. |
+| `beedk-ats-rad-tile`                   | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ats-rad-tile) | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-rad-tile` Maven Tile.  It enables RAD of the ACS Platform with the Alfresco Transform Service (ATS) enabled.  This is great for any project requiring Alfresco Enterprise transformation functionality. |
+| `beedk-ate-rad-tile`                   | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ate-rad-tile) | Intended to be inherited by any project that already includes a `beedk-acs-platform-*-rad-tile` Maven Tile.  It enables RAD of the ACS Platform with a specific Alfresco Transform Engine (ATE) enabled.  This is great for any project requiring custom Alfresco transformation functionality. |

 ### Rapid Application Development

@@ -126,7 +137,7 @@ If your project includes RAD tiles, you can start the application with the follo
 mvn -Drad process-classes
 ```

-To stop RAD and remove the Docker containers, you will need to do it through Docker commands.  This will differ between operating systems.
+To stop RAD and remove the Docker containers, you will need to do it through Docker commands.  This will differ between operating systems.  The Maven Archetypes provides scripts to assist with these operations called `rad.sh` or `rad.ps1`.

 #### SH or BASH Shells

@@ -144,18 +155,16 @@ docker container ls -aq --filter={artifactId}-* | % { docker container rm $_ }

 ### Archetypes

-| Archetype                   | Folder Link   | Details |
-| --------------------------- | ------------- | ------- |
-| `beedk-acs-platform-module` | *Coming Soon* | Generates a standalone ACS Platform module project. |
-| `beedk-acs-platform-webapp` | *Coming Soon* | Generates a standalone ACS Platform webapp project. |
-| `beedk-acs-share-module`    | *Coming Soon* | Generates a standalone ACS Share module project. |
-| `beedk-acs-share-webapp`    | *Coming Soon* | Generates a standalone ACS Share webapp project. |
-| `beedk-acs-aio`             | *Coming Soon* | Generates a parent, ACS Platform webapp, ACS Share webapp, 2 sample ACS Platform module, and 2 sample ACS Share module projects. |
-| `beedk-ate-app`             | *Coming Soon* | Generates a standalone Alfresco Transform Engine project. |
-| `beedk-ate-aio`             | *Coming Soon* | Generates a parent, ATE app, ACS Platform webapp, ACS Share webapp, and a sample ACS Platform module projects.  The ACS Platform module will include sample ATE configuration. |
-| `beedk-activiti-ext`        | *Coming Soon* | Generates a standalone APS/Activiti extension project. |
-| `beedk-flowable-ext`        | *Coming Soon* | Generates a standalone [Flowable](https://flowable.com) extension project.  Flowable is a fork of Activiti 6. |
-| `beedk-camunda-ext`         | *Coming Soon* | Generates a standalone [Camunda](https://camunda.com) extension project.  Camunda is a fork of Activiti 5. |
+| Archetype                             | Folder Link   | Details |
+| ------------------------------------- | ------------- | ------- |
+| `beedk-acs-platform-module-archetype` | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-module-archetype) | Generates a standalone ACS Platform module project. |
+| `beedk-acs-share-module-archetype`    | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-module-archetype) | Generates a standalone ACS Share module project. |
+| `beedk-acs-allinone-archetype`        | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-acs-allinone-archetype) | Generates a parent, ACS Platform webapp, ACS Share webapp, example ACS Platform module, example ACS Share module, and example ATE projects. |
+| `beedk-ate-archetype`                 | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-ate-archetype) | Generates a standalone Alfresco Transform Engine project. |
+| `beedk-activiti-ext-archetype`        | *Coming Soon* | Generates a standalone APS/Activiti extension project. |
+| `beedk-flowable-ext-archetype`        | *Coming Soon* | Generates a standalone [Flowable](https://flowable.com) extension project.  Flowable is a fork of Activiti 6. |
+| `beedk-camunda-ext-archetype`         | *Coming Soon* | Generates a standalone [Camunda](https://camunda.com) extension project.  Camunda is a fork of Activiti 5. |
+| `beedk-springboot-api-archetype`      | [Source](/inteligr8/ootbee-beedk/src/stable/beedk-springboot-api-archetype) | Generates a standalone Spring Boot application ready to interface with the ACS APIs (*APS Coming Soon*). |

 You can use one of these Maven Archetypes to generate a new project by executing the following at the command line.

@@ -185,6 +194,7 @@ The plan is to implement the following engines (and more).
 | `scaffold-behavior`     | `name`, `event` (`onUpdateProperties`, ...) | Generates skeleton code for the configuration and implementation of an Alfresco Policy Behavior; an event listener entrypoint. |
 | `scaffold-job`          | `name`, `schedule` | Generates skeleton code for the configuration and implementation of a Quartz Job; a scheduled periodic execution entrypoint. |
 | `scaffold-action`       | `name`  | Generates skeleton code for the configuration and implementation of an Alfresco Action; a function that may be executed through API calls or ACS Share hooks. |
+| `scaffold-jsroot`       | `name`  | Generates skeleton code for the configuration and implementation of a JavaScript root object; a root scoped object accessible through JavaScript scripts. |
 | `scaffold-rendition`    | `name`  | Generates skeleton code for the configuration of an Alfresco rendition. |
 | `scaffold-evaluator`    | `name`, `type` (**`component`**, `em`) | Generates skeleton code for the configuration and implementation of a Spring Surf (ACS Share) evaluator; a conditional filter on user interface components or extensibility modules. |
 | `scaffold-extmodule`    | `name`, `style` (**`config`**, `webscript`) | Generates skeleton code for the configuration and implementation of a Spring Surf extensibility module. |
@@ -234,7 +244,7 @@ git merge personal
 git push origin
 git checkout stable
 git merge develop
-mvn versions:set
+mvn versions:set -DprocessAllModules
 mvn clean deploy
 git add pom.xml
 git commit -m "vX.Y.Z poms"
--- a/beedk-acs-allinone-archetype/pom.xml
+++ b/beedk-acs-allinone-archetype/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-allinone-archetype</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>maven-archetype</packaging>

 	<name>Order of the Bee Development Kit: Project Scaffolding for multi-module ACS projects</name>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.ps1
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.ps1
@@ -13,6 +13,11 @@ function start_ {
 	mvn -Drad process-classes
 }

+function start_log {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad "-Ddocker.showLogs" process-classes
+}
+
 function stop_ {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
@@ -41,6 +46,9 @@ switch ($args[0]) {
 	"start" {
 		start_
 	}
+	"start_log" {
+		start_log
+	}
 	"stop" {
 		stop_
 	}
@@ -58,7 +66,7 @@ switch ($args[0]) {
 		list
 	}
 	default {
-		echo "Usage: .\rad.ps1 [ start | stop | restart | rebuild | tail {container} | containers ]"
+		echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
 	}
 }

--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.sh
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.sh
@@ -1,7 +1,7 @@
 #!/bin/sh

 discoverArtifactId() {
-	ARTIFACT_ID=`mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec 2>/dev/null`
+	ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
 }

 rebuild() {
@@ -14,6 +14,11 @@ start() {
 	mvn -Drad process-classes
 }

+start_log() {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad -Ddocker.showLogs process-classes
+}
+
 stop() {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
@@ -38,6 +43,9 @@ case "$1" in
 	start)
 		start
 		;;
+	start_log)
+		start_log
+		;;
 	stop)
 		stop
 		;;
@@ -55,7 +63,7 @@ case "$1" in
 		list
 		;;
 	*)
-		echo "Usage: ./rad.sh [ start | stop | restart | rebuild | tail {container} | containers ]"
+		echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
 		exit 1
 esac

--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleEarlyComponent.java
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleEarlyComponent.java
@@ -1,4 +1,4 @@
-package ${package}.annotation;
+package ${package}.spring;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleLateComponent.java
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleLateComponent.java
@@ -1,4 +1,4 @@
-package ${package}.annotation;
+package ${package}.spring;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml
@@ -1,9 +1,9 @@
 <!-- Documentation: https://docs.alfresco.com/content-services/6.2/develop/reference/web-scripts-ref -->
 <webscript>
-    <shortname>Example Webscript</shortname>
-    <description>Example Java-backed webscript description</description>
-    <url>/exampleJava?paramName={paramValue}</url>
-    <authentication>user</authentication>
-    <format default="json"></format>
-    <family>${shortname}</family>
+	<shortname>Example Webscript</shortname>
+	<description>Example Java-backed webscript description</description>
+	<url>/exampleJava?paramName={paramValue}</url>
+	<authentication>user</authentication>
+	<format default="json"></format>
+	<family>${shortname}</family>
 </webscript>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml
@@ -1,9 +1,9 @@
 <!-- Documentation: https://docs.alfresco.com/content-services/6.2/develop/reference/web-scripts-ref -->
 <webscript>
-    <shortname>Example Webscript</shortname>
-    <description>Example JS-backed webscript description</description>
-    <url>/exampleJs?paramName={paramValue}</url>
-    <authentication>guest</authentication>
-    <format default="json"></format>
-    <family>${shortname}</family>
+	<shortname>Example Webscript</shortname>
+	<description>Example JS-backed webscript description</description>
+	<url>/exampleJs?paramName={paramValue}</url>
+	<authentication>guest</authentication>
+	<format default="json"></format>
+	<family>${shortname}</family>
 </webscript>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/dataset/example_v1.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/dataset/example_v1.xml
@@ -0,0 +1,8 @@
+<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0"
+		xmlns:cm="http://www.alfresco.org/model/content/1.0"
+		xmlns:bfs="http://fiscal.treasury.gov/alfresco/model/common/1.0">
+
+	<cm:folder>
+		<cm:name>Example Folder</cm:name>
+	</cm:folder>
+</view:view>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/messages/example-model.en_US.properties
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/messages/example-model.en_US.properties
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/model/example-model.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/model/example-model.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model name="ootbee:exampleDataModel"
-		xmlns="http://www.alfresco.org/model/dictionary/1.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.alfresco.org/model/dictionary/1.0 https://raw.githubusercontent.com/Alfresco/alfresco-repository/master/src/main/resources/alfresco/model/modelSchema.xsd">
-
-    <description>Example Data Model</description>
-    <author>Order of the Bee</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>
-
-    <namespaces>
-        <namespace uri="http://orderofthebee.org/alfresco/model/example/1.0" prefix="example"/>
-    </namespaces>
-
-</model>
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="ootbee:exampleDataModel"
+		xmlns="http://www.alfresco.org/model/dictionary/1.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://www.alfresco.org/model/dictionary/1.0 https://raw.githubusercontent.com/Alfresco/alfresco-repository/master/src/main/resources/alfresco/model/modelSchema.xsd">
+
+	<description>Example Data Model</description>
+	<author>Order of the Bee</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>
+
+	<namespaces>
+		<namespace uri="http://orderofthebee.org/alfresco/model/example/1.0" prefix="example"/>
+	</namespaces>
+
+</model>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module-bootstrap-context.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module-bootstrap-context.xml
@@ -9,7 +9,7 @@

 	<!-- Enable Spring annotation scanning for classes in package -->
 	<context:component-scan base-package="${package}">
-		<context:include-filter type="annotation" expression="${package}.annotation.ModuleEarlyComponent" />
+		<context:include-filter type="annotation" expression="${package}.spring.ModuleEarlyComponent" />
 	</context:component-scan>

 	<!-- Example Data Model loading -->
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module-context.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module-context.xml
@@ -9,8 +9,8 @@

 	<!-- Enable Spring annotation scanning for classes in package -->
 	<context:component-scan base-package="${package}">
-		<context:exclude-filter type="annotation" expression="${package}.annotation.ModuleEarlyComponent" />
-		<context:exclude-filter type="annotation" expression="${package}.annotation.ModuleLateComponent" />
+		<context:exclude-filter type="annotation" expression="${package}.spring.ModuleEarlyComponent" />
+		<context:exclude-filter type="annotation" expression="${package}.spring.ModuleLateComponent" />
 	</context:component-scan>
 	
 	<bean id="${project.groupId}.${project.artifactId}.jsroot.example" class="${package}.ExampleJavaScriptRootObject" parent="baseJavaScriptExtension">
@@ -19,4 +19,25 @@
 	
 	<bean id="${project.groupId}.${project.artifactId}.action.example" class="${package}.ExampleActionExecuter" parent="action-executer" />

+	<bean id="${project.groupId}.${project.artifactId}.dataBootstrap_v1.0"
+			class="org.alfresco.repo.module.ImporterModuleComponent" parent="module.baseComponent"
+			depends-on="${project.groupId}.${project.artifactId}.dictionaryBootstrap">
+		
+		<property name="moduleId" value="${project.artifactId}" />
+		<property name="name" value="${project.name} Data" />
+		<property name="description" value="Initial data load for ${project.name}" />
+		<property name="sinceVersion" value="0.1" />
+		<property name="appliesFromVersion" value="0.1" />
+		
+		<property name="importer" ref="spacesBootstrap" />
+		<property name="bootstrapViews">
+			<list>
+				<props>
+					<prop key="path">/${spaces.company_home.childname}</prop>
+					<prop key="location">alfresco/module/${project.groupId}.${project.artifactId}/dataset/example_v1.xml</prop>
+				</props>
+			</list>
+		</property>
+	</bean>
+
 </beans>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module-uninstall-context.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module-uninstall-context.xml
@@ -10,7 +10,7 @@

 	<!-- Enable Spring annotation scanning for classes in package -->
 	<context:component-scan base-package="${package}">
-		<context:include-filter type="annotation" expression="${package}.annotation.ModuleLateComponent" />
+		<context:include-filter type="annotation" expression="${package}.spring.ModuleLateComponent" />
 	</context:component-scan>

 </beans>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module.properties
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module.properties
@@ -1,5 +1,5 @@
-module.id=${project.artifactId}
-#module.aliases=myModule-123, my-module
-module.title=${project.name}
-module.description=${project.description}
-module.version=${project.version}
+module.id=${project.artifactId}
+#module.aliases=myModule-123, my-module
+module.title=${project.name}
+module.description=${project.description}
+module.version=${project.version}
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
@@ -1,63 +1,63 @@
-<?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>
-    <!--
-        To support hot reloading of server side Javascript files in Share, we have to turn on development mode.
-        This setting will tell the Rhinoscript Processor not to compile and cache the JS files.
-        Cool, we can now change server side JS files and have the changes picked up,
-        without having to restart or refresh web scripts.
-
-        But… Due to a known bug in the Surf framework (ALF-9970) this will break the admin consoles in Share.
-
-        Override this bean and disable javascript compilation so that webscripts can be hot reloaded.
-        We have changed the 'compile' property from true to false.
-        -->
-    <bean id="javaScriptProcessor" class="org.alfresco.repo.jscript.RhinoScriptProcessor" init-method="register">
-        <property name="name">
-            <value>javascript</value>
-        </property>
-        <property name="extension">
-            <value>js</value>
-        </property>
-        <!-- Do not "compile javascript and cache compiled scripts" -->
-        <property name="compile">
-            <value>false</value>
-        </property>
-        <!-- allow sharing of sealed scopes for performance -->
-        <!-- disable to give each script it's own new scope which can be extended -->
-        <property name="shareSealedScopes">
-            <value>true</value>
-        </property>
-        <property name="scriptService">
-            <ref bean="scriptService"/>
-        </property>
-        <!-- Creates ScriptNodes which require the ServiceRegistry -->
-        <property name="serviceRegistry">
-            <ref bean="ServiceRegistry"/>
-        </property>
-        <property name="storeUrl">
-            <value>${spaces.store}</value>
-        </property>
-        <property name="storePath">
-            <value>${spaces.company_home.childname}</value>
-        </property>
-    </bean>
-
-
-</beans>
+<?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>
+    <!--
+        To support hot reloading of server side Javascript files in Share, we have to turn on development mode.
+        This setting will tell the Rhinoscript Processor not to compile and cache the JS files.
+        Cool, we can now change server side JS files and have the changes picked up,
+        without having to restart or refresh web scripts.
+
+        But… Due to a known bug in the Surf framework (ALF-9970) this will break the admin consoles in Share.
+
+        Override this bean and disable javascript compilation so that webscripts can be hot reloaded.
+        We have changed the 'compile' property from true to false.
+        -->
+    <bean id="javaScriptProcessor" class="org.alfresco.repo.jscript.RhinoScriptProcessor" init-method="register">
+        <property name="name">
+            <value>javascript</value>
+        </property>
+        <property name="extension">
+            <value>js</value>
+        </property>
+        <!-- Do not "compile javascript and cache compiled scripts" -->
+        <property name="compile">
+            <value>false</value>
+        </property>
+        <!-- allow sharing of sealed scopes for performance -->
+        <!-- disable to give each script it's own new scope which can be extended -->
+        <property name="shareSealedScopes">
+            <value>true</value>
+        </property>
+        <property name="scriptService">
+            <ref bean="scriptService"/>
+        </property>
+        <!-- Creates ScriptNodes which require the ServiceRegistry -->
+        <property name="serviceRegistry">
+            <ref bean="ServiceRegistry"/>
+        </property>
+        <property name="storeUrl">
+            <value>${spaces.store}</value>
+        </property>
+        <property name="storePath">
+            <value>${spaces.company_home.childname}</value>
+        </property>
+    </bean>
+
+
+</beans>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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}-parent</artifactId>
-	<version>${version}</version>
-	<packaging>pom</packaging>
-
-	<name>${shortname} ACS All-in-one Parent Project</name>
-
-	<properties>
-		<alfresco.sdk.version>4.2.0</alfresco.sdk.version>
-		<edition>community</edition>
-		<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
-		<alfresco.share.version>6.2.2.2</alfresco.share.version>
-		
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>8</maven.compiler.source>
-		<maven.compiler.target>8</maven.compiler.target>
-	</properties>
-
-	<modules>
-		<module>tengine-A</module>
-
-		<module>platform-module-A</module>
-        <module>platform-webapp</module>
-
-		<module>share-module-A</module>
-		<module>share-webapp</module>
-	</modules>
-
-	<repositories>
-		<repository>
-			<id>inteligr8-releases</id>
-			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
-		</repository>
-		<repository>
-			<id>alfresco-public</id>
-			<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
-		</repository>
-	</repositories>
-	
-	<pluginRepositories>
-		<pluginRepository>
-			<id>inteligr8-releases</id>
-			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-private</url>
-		</pluginRepository>
-	</pluginRepositories>
-</project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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}-parent</artifactId>
+	<version>${version}</version>
+	<packaging>pom</packaging>
+
+	<name>${shortname} ACS All-in-one Parent Project</name>
+
+	<properties>
+		<alfresco.sdk.version>4.2.0</alfresco.sdk.version>
+		<edition>community</edition>
+		<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
+		<alfresco.share.version>6.2.2.2</alfresco.share.version>
+		
+    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>
+	</properties>
+
+	<modules>
+		<module>tengine-A</module>
+
+		<module>platform-module-A</module>
+        <module>platform-webapp</module>
+
+		<module>share-module-A</module>
+		<module>share-webapp</module>
+	</modules>
+
+	<repositories>
+		<repository>
+			<id>inteligr8-releases</id>
+			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+		</repository>
+		<repository>
+			<id>alfresco-public</id>
+			<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+		</repository>
+	</repositories>
+	
+	<pluginRepositories>
+		<pluginRepository>
+			<id>inteligr8-releases</id>
+			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-private</url>
+		</pluginRepository>
+	</pluginRepositories>
+</project>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.ps1
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.ps1
@@ -13,6 +13,11 @@ function start_ {
 	mvn -Drad process-classes
 }

+function start_log {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad "-Ddocker.showLogs" process-classes
+}
+
 function stop_ {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
@@ -41,6 +46,9 @@ switch ($args[0]) {
 	"start" {
 		start_
 	}
+	"start_log" {
+		start_log
+	}
 	"stop" {
 		stop_
 	}
@@ -58,7 +66,7 @@ switch ($args[0]) {
 		list
 	}
 	default {
-		echo "Usage: .\rad.ps1 [ start | stop | restart | rebuild | tail {container} | containers ]"
+		echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
 	}
 }

--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.sh
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.sh
@@ -1,7 +1,7 @@
 #!/bin/sh

 discoverArtifactId() {
-	ARTIFACT_ID=`mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec 2>/dev/null`
+	ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
 }

 rebuild() {
@@ -14,6 +14,11 @@ start() {
 	mvn -Drad process-classes
 }

+start_log() {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad -Ddocker.showLogs process-classes
+}
+
 stop() {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
@@ -38,6 +43,9 @@ case "$1" in
 	start)
 		start
 		;;
+	start_log)
+		start_log
+		;;
 	stop)
 		stop
 		;;
@@ -55,7 +63,7 @@ case "$1" in
 		list
 		;;
 	*)
-		echo "Usage: ./rad.sh [ start | stop | restart | rebuild | tail {container} | containers ]"
+		echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
 		exit 1
 esac

--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/META-INF/share-config-custom.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/META-INF/share-config-custom.xml
@@ -1,334 +1,334 @@
-<alfresco-config>
-
-	<config evaluator="string-compare" condition="DocumentLibrary">
-		<aspects>
-			<visible>
-				<aspect name="example:aspect" />
-			</visible>
-			<addable> <!-- defaults to visible config -->
-			</addable>
-			<removeable> <!-- defaults to visible config -->
-			</removeable>
-		</aspects>
-		<types>
-			<type name="cm:content">
-				<subtype name="example:document"/>
-			</type>
-		</types>
-	</config>
-
-	<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.exampleDocument" descriptionId="form.description.advancedsearch.exampleDocument">example:document</form>
-			</forms>
-		</advanced-search>
-	</config>
-	
-	<config evaluator="node-type" condition="example: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"/>
-				</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"/>
-
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</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"/>
-				</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>
-
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</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"/>
-				</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>
-
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</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"/>
-				</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>
-					
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</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"/>
-				</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>
-
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</appearance>
-			</form>
-		</forms>
-	</config>
-
-</alfresco-config>
+<alfresco-config>
+
+	<config evaluator="string-compare" condition="DocumentLibrary">
+		<aspects>
+			<visible>
+				<aspect name="example:aspect" />
+			</visible>
+			<addable> <!-- defaults to visible config -->
+			</addable>
+			<removeable> <!-- defaults to visible config -->
+			</removeable>
+		</aspects>
+		<types>
+			<type name="cm:content">
+				<subtype name="example:document"/>
+			</type>
+		</types>
+	</config>
+
+	<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.exampleDocument" descriptionId="form.description.advancedsearch.exampleDocument">example:document</form>
+			</forms>
+		</advanced-search>
+	</config>
+	
+	<config evaluator="node-type" condition="example: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"/>
+				</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"/>
+
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</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"/>
+				</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>
+
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</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"/>
+				</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>
+
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</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"/>
+				</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>
+					
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</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"/>
+				</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>
+
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</appearance>
+			</form>
+		</forms>
+	</config>
+
+</alfresco-config>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/alfresco/module/groupId.artifactId/module.properties
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/alfresco/module/groupId.artifactId/module.properties
@@ -1,5 +1,5 @@
-module.id=${project.artifactId}
-#module.aliases=myModule-123, my-module
-module.title=${project.name}
-module.description=${project.description}
-module.version=${project.version}
+module.id=${project.artifactId}
+#module.aliases=myModule-123, my-module
+module.title=${project.name}
+module.description=${project.description}
+module.version=${project.version}
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/META-INF/share-config-custom.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/META-INF/share-config-custom.xml
@@ -1,95 +1,95 @@
-<alfresco-config>
-
-    <config evaluator="string-compare" condition="WebFramework">
-        <web-framework>
-            <autowire>
-                <!-- Changing this to 'development' currently breaks the Admin Console.
-                     Instead we make a POST to clear Share dependency caches, see 'clear-caches-refresh-ws' profile. -->
-                <mode>production</mode> <!-- not really need in the long run, used for YUI - deprecate -->
-            </autowire>
-
-            <!--
-                 We don't need to do this when we have the new refresh mojos in the Alfresco plug-in.
-
-                 If resource caching has been disabled then all the dependency caches will be cleared
-                 before processing the Aikau jsonModel request...
-                    (i.e. this.dojoDependencyHandler.clearCaches() )
-
-                 For more information see the Aikau source code: https://github.com/Alfresco/Aikau
-            -->
-            <disable-resource-caching>true</disable-resource-caching>
-        </web-framework>
-    </config>
-
-
-    <!-- Global config section -->
-    <config replace="true">
-        <flags>
-            <!--
-               Developer debugging setting to turn on DEBUG mode for client scripts in the browser
-            -->
-            <client-debug>true</client-debug>
-            <!--
-               LOGGING can always be toggled at runtime when in DEBUG mode (Ctrl, Ctrl, Shift, Shift).
-               This flag automatically activates logging on page load.
-            -->
-            <client-debug-autologging>false</client-debug-autologging>
-        </flags>
-    </config>
-
-    <!--
-        Disable CSRF completely for now
-        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
-        -->
-    <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-        <filter/>
-    </config>
-
-
-    <!--
-        Change so it is picked up from property where the Alfresco Repo Webapp is running
-        (e.g. http://localhost:8080/alfresco)
-        -->
-    <config evaluator="string-compare" condition="Remote">
-        <remote>
-            <endpoint>
-                <id>alfresco-noauth</id>
-                <name>Alfresco - unauthenticated access</name>
-                <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
-                <identity>none</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco</id>
-                <name>Alfresco - user access</name>
-                <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
-                <identity>user</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco-feed</id>
-                <name>Alfresco Feed</name>
-                <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
-                <connector-id>http</connector-id>
-                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
-                <basic-auth>true</basic-auth>
-                <identity>user</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco-api</id>
-                <parent-id>alfresco</parent-id>
-                <name>Alfresco Public API - user access</name>
-                <description>Access to Alfresco Repository Public API that require user authentication.
-                    This makes use of the authentication that is provided by parent 'alfresco' endpoint.</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${acs-platform.url}/alfresco/api</endpoint-url>
-                <identity>user</identity>
-            </endpoint>
-        </remote>
-    </config>
-</alfresco-config>
+<alfresco-config>
+
+    <config evaluator="string-compare" condition="WebFramework">
+        <web-framework>
+            <autowire>
+                <!-- Changing this to 'development' currently breaks the Admin Console.
+                     Instead we make a POST to clear Share dependency caches, see 'clear-caches-refresh-ws' profile. -->
+                <mode>production</mode> <!-- not really need in the long run, used for YUI - deprecate -->
+            </autowire>
+
+            <!--
+                 We don't need to do this when we have the new refresh mojos in the Alfresco plug-in.
+
+                 If resource caching has been disabled then all the dependency caches will be cleared
+                 before processing the Aikau jsonModel request...
+                    (i.e. this.dojoDependencyHandler.clearCaches() )
+
+                 For more information see the Aikau source code: https://github.com/Alfresco/Aikau
+            -->
+            <disable-resource-caching>true</disable-resource-caching>
+        </web-framework>
+    </config>
+
+
+    <!-- Global config section -->
+    <config replace="true">
+        <flags>
+            <!--
+               Developer debugging setting to turn on DEBUG mode for client scripts in the browser
+            -->
+            <client-debug>true</client-debug>
+            <!--
+               LOGGING can always be toggled at runtime when in DEBUG mode (Ctrl, Ctrl, Shift, Shift).
+               This flag automatically activates logging on page load.
+            -->
+            <client-debug-autologging>false</client-debug-autologging>
+        </flags>
+    </config>
+
+    <!--
+        Disable CSRF completely for now
+        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
+        -->
+    <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
+        <filter/>
+    </config>
+
+
+    <!--
+        Change so it is picked up from property where the Alfresco Repo Webapp is running
+        (e.g. http://localhost:8080/alfresco)
+        -->
+    <config evaluator="string-compare" condition="Remote">
+        <remote>
+            <endpoint>
+                <id>alfresco-noauth</id>
+                <name>Alfresco - unauthenticated access</name>
+                <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
+                <connector-id>alfresco</connector-id>
+                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
+                <identity>none</identity>
+            </endpoint>
+
+            <endpoint>
+                <id>alfresco</id>
+                <name>Alfresco - user access</name>
+                <description>Access to Alfresco Repository WebScripts that require user authentication</description>
+                <connector-id>alfresco</connector-id>
+                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
+                <identity>user</identity>
+            </endpoint>
+
+            <endpoint>
+                <id>alfresco-feed</id>
+                <name>Alfresco Feed</name>
+                <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
+                <connector-id>http</connector-id>
+                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
+                <basic-auth>true</basic-auth>
+                <identity>user</identity>
+            </endpoint>
+
+            <endpoint>
+                <id>alfresco-api</id>
+                <parent-id>alfresco</parent-id>
+                <name>Alfresco Public API - user access</name>
+                <description>Access to Alfresco Repository Public API that require user authentication.
+                    This makes use of the authentication that is provided by parent 'alfresco' endpoint.</description>
+                <connector-id>alfresco</connector-id>
+                <endpoint-url>${acs-platform.url}/alfresco/api</endpoint-url>
+                <identity>user</identity>
+            </endpoint>
+        </remote>
+    </config>
+</alfresco-config>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/log4j.properties
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/log4j.properties
@@ -1,56 +1,56 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Set root logger level to error
-log4j.rootLogger=error, 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=share.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
-
-# Spring
-log4j.logger.org.springframework=warn
-# Turn off Spring remoting warnings that should really be info or debug.
-log4j.logger.org.springframework.remoting.support=error
-log4j.logger.org.springframework.util=error
-
-# MyFaces
-log4j.logger.org.apache.myfaces.util.DebugUtils=info
-log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
-log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
-log4j.logger.org.apache.myfaces.taglib=error
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.web=info
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Freemarker
-# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-#-----------------------------------------------------------------------
-# Custom Share module logging goes here...
-#-----------------------------------------------------------------------
-
-log4j.logger.${package}=debug
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Set root logger level to error
+log4j.rootLogger=error, 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=share.log
+log4j.appender.File.Append=true
+log4j.appender.File.DatePattern='.'yyyy-MM-dd
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
+
+# Spring
+log4j.logger.org.springframework=warn
+# Turn off Spring remoting warnings that should really be info or debug.
+log4j.logger.org.springframework.remoting.support=error
+log4j.logger.org.springframework.util=error
+
+# MyFaces
+log4j.logger.org.apache.myfaces.util.DebugUtils=info
+log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
+log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
+log4j.logger.org.apache.myfaces.taglib=error
+
+# Alfresco
+log4j.logger.org.alfresco=error
+log4j.logger.org.alfresco.config=warn
+log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
+log4j.logger.org.alfresco.web=info
+
+# Web Framework
+log4j.logger.org.springframework.extensions.webscripts=info
+log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=info
+log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+log4j.logger.freemarker.runtime=
+
+#-----------------------------------------------------------------------
+# Custom Share module logging goes here...
+#-----------------------------------------------------------------------
+
+log4j.logger.${package}=debug
--- a/beedk-acs-lts-it-tile/pom.xml
+++ b/beedk-acs-lts-it-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-lts-it-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: Integration Testing for ACS Local Transform Service</name>
--- a/beedk-acs-lts-rad-tile/pom.xml
+++ b/beedk-acs-lts-rad-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-lts-rad-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: RAD for ACS Local Transform Service</name>
--- a/beedk-acs-module-tile/pom.xml
+++ b/beedk-acs-module-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-module-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: ACS Module Core</name>
--- a/beedk-acs-module-tile/tile.xml
+++ b/beedk-acs-module-tile/tile.xml
@@ -110,7 +110,7 @@
 					</nonFilteredFileExtensions>
 				</configuration>
 				<executions>
-					<!-- This plugin execution consolidates the compiled/generated/filtered resources into one directory for packaging -->
+					<!-- This plugin execution consolidates the generated/filtered resources into one directory for compiling -->
 					<execution>
 						<id>consolidate-resources</id>
 						<phase>process-resources</phase>
@@ -121,6 +121,9 @@
 								<resource>
 									<directory>${project.build.outputDirectory}</directory>
 									<filtering>false</filtering>
+									<excludes>
+										<exclude>**/*.class</exclude>
+									</excludes>
 								</resource>
 								<resource>
 									<directory>${project.build.directory}/module-classes</directory>
@@ -133,6 +136,24 @@
 							</resources>
 						</configuration>
 					</execution>
+					<!-- This plugin execution consolidates the compiled resources into one directory for packaging -->
+					<execution>
+						<id>consolidate-classes</id>
+						<phase>process-classes</phase>
+						<goals><goal>copy-resources</goal></goals>
+						<configuration>
+							<outputDirectory>${project.build.packageDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.build.outputDirectory}</directory>
+									<filtering>false</filtering>
+									<includes>
+										<include>**/*.class</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<!-- This plugin minifies (compresses) JavaScript files -->
@@ -182,7 +203,7 @@
 			<plugin>
 				<groupId>com.inteligr8.alfresco</groupId>
 				<artifactId>amp-plugin</artifactId>
-				<version>1.0.1</version>
+				<version>1.0.6</version>
 				<executions>
 					<execution>
 						<id>build-amp-file</id>
@@ -196,6 +217,51 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!-- This plugin checks for an AMP file produced during the package phase -->
+			<plugin>
+				<groupId>com.inteligr8</groupId>
+				<artifactId>conditional-maven-plugin</artifactId>
+				<version>1.0.1</version>
+				<executions>
+					<execution>
+						<id>check-amp-file</id>
+						<phase>package</phase>
+						<goals>
+							<goal>file-existence</goal>
+						</goals>
+						<configuration>
+							<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
+							<trueValue>false</trueValue>
+							<falseValue>true</falseValue>
+							<newProperty>beedk.noAmp</newProperty>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- This plugin enables/disables the AMP file during the install/deploy phases -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>attach-amp</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<type>amp</type>
+									<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
+								</artifact>
+							</artifacts>
+							<skipAttach>${beedk.noAmp}</skipAttach>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	
--- a/beedk-acs-platform-artifact-it-tile/pom.xml
+++ b/beedk-acs-platform-artifact-it-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-artifact-it-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: Integration Testing for ACS Platform by Maven Artifact</name>
--- a/beedk-acs-platform-artifact-it-tile/tile.xml
+++ b/beedk-acs-platform-artifact-it-tile/tile.xml
@@ -8,14 +8,15 @@
 			<!-- This plugin downloads the Platform WAR and JDBC JAR dependency -->
 			<plugin>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.2</version>
+				<version>3.2.0</version>
 				<executions>
 					<!-- This execution downloads the Platform WAR -->
 					<execution>
 						<id>download-platform-webapp</id>
-						<phase>pre-integration-test</phase>
+						<phase>package</phase>
 						<goals><goal>copy</goal></goals>
 						<configuration>
+							<skip>${skipTests}</skip>
 							<artifactItems>
 								<artifactItem>
 									<groupId>${alfresco.platform.war.groupId}</groupId>
@@ -30,9 +31,10 @@
 					<!-- This execution downloads the postgreSQL JDBC JAR -->
 					<execution>
 						<id>download-platform-jdbc</id>
-						<phase>pre-integration-test</phase>
+						<phase>package</phase>
 						<goals><goal>copy</goal></goals>
 						<configuration>
+							<skip>${skipTests}</skip>
 							<artifactItems>
 								<artifactItem>
 								    <groupId>org.postgresql</groupId>
--- a/beedk-acs-platform-artifact-rad-tile/pom.xml
+++ b/beedk-acs-platform-artifact-rad-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-artifact-rad-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: RAD for ACS Platform by Maven Artifact</name>
--- a/beedk-acs-platform-artifact-rad-tile/tile.xml
+++ b/beedk-acs-platform-artifact-rad-tile/tile.xml
@@ -16,7 +16,7 @@
 					<!-- This plugin downloads the Platform WAR and JDBC JAR dependency -->
 					<plugin>
 						<artifactId>maven-dependency-plugin</artifactId>
-						<version>3.1.2</version>
+						<version>3.2.0</version>
 						<executions>
 							<!-- This execution downloads the Platform WAR -->
 							<execution>
--- a/beedk-acs-platform-it-tile/README.md
+++ b/beedk-acs-platform-it-tile/README.md
@@ -52,6 +52,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
 | `acs-activemq.port`        |          | 8161            | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
 | `acs-platform.tomcat.opts` |          |                 | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.* |
 | `acs-platform.timeout`     |          | 120000          | The time to wait for the startup to complete, in milliseconds. |
+| `alfresco.license.directory` |  | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. |
+| `acs.license.directory`    |  | `${alfresco.license.directory}/acs` | The base path to search for an ACS license. |
 | `acs-postgres.version`     |          | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
 | `acs-activemq.version`     |          | *not important* | The version of Alfresco ActiveMQ to use in the integration testing infrastructure. |

--- a/beedk-acs-platform-it-tile/pom.xml
+++ b/beedk-acs-platform-it-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-it-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: Integration Testing for ACS Platform Core</name>
--- a/beedk-acs-platform-it-tile/tile.xml
+++ b/beedk-acs-platform-it-tile/tile.xml
@@ -57,12 +57,14 @@
 										<skip>${skipTests}</skip>
 										<env>
 											<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
+											<ENABLE_JDWP>false</ENABLE_JDWP>
+											<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
 											<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
 												-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
 												-Dtransform.service.enabled=${beedk.deploy.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
 												-Dlocal.transform.service.enabled=${beedk.deploy.alts.enabled} \
 												-DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \
-												-Djodconverter.enabled=false \
+												-Djodconverter.enabled=false -Dsystem.workflow.engine.activiti.enabled=true \
 												-Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 -Dimg.url=http://${project.artifactId}-ate-aio:8090 -Dtika.url=http://${project.artifactId}-ate-aio:8090 -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \
 												-Dindex.subsystem.name=${beedk.deploy.platform.index} -Dsolr.host=${project.artifactId}-acs-search -Dsolr.secureComms=none \
 												${acs-platform.tomcat.opts}</CATALINA_OPTS>
@@ -76,6 +78,7 @@
 										</network>
 										<volumes>
 											<bind>
+												<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
 												<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
 												<volume>${beedk.deploy.platform.testClassesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
 												<volume>${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
@@ -194,6 +197,8 @@
 				<beedk.deploy.platform.dataDirectory>${project.build.directory}/alf_data</beedk.deploy.platform.dataDirectory>
 				<acs-platform.timeout>120000</acs-platform.timeout>
 				<acs-platform.memory>1g</acs-platform.memory>
+				<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
+				<acs.license.directory>${alfresco.license.directory}/acs</acs.license.directory>

 				<!-- ports -->
 				<acs-postgres.port>5432</acs-postgres.port>
@@ -203,7 +208,7 @@
 				<!-- versions -->
 				<acs-postgres.version>9.6</acs-postgres.version>
 				<acs-activemq.version>5.15.8</acs-activemq.version>
-				<tomcat-rad.version>9-1.3</tomcat-rad.version>
+				<tomcat-rad.version>9-1.4</tomcat-rad.version>
 			</properties>
 		</profile>
 	</profiles>
--- a/beedk-acs-platform-module-archetype/pom.xml
+++ b/beedk-acs-platform-module-archetype/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-module-archetype</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>maven-archetype</packaging>

 	<name>Order of the Bee Development Kit: Project Scaffolding for an ACS Platform Module</name>
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,47 +1,47 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <version>${version}</version>
-    <packaging>jar</packaging>
-    
-    <name>${shortname} ACS Platform Module</name>
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<version>${version}</version>
+	<packaging>jar</packaging>
+	
+	<name>${shortname} ACS Platform Module</name>

-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    	<maven.compiler.source>8</maven.compiler.source>
-    	<maven.compiler.target>8</maven.compiler.target>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>

 		<alfresco.sdk.version>4.2.0</alfresco.sdk.version>
-        <alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
-    </properties>
+		<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
+	</properties>

-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>acs-community-packaging</artifactId>
-                <version>${alfresco.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.alfresco</groupId>
+				<artifactId>acs-community-packaging</artifactId>
+				<version>${alfresco.platform.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>

-    <dependencies>
-        <!-- Very popular, but not required, dependency -->
-        <!-- Provided as an example -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-repository</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<!-- Very popular, but not required, dependency -->
+		<!-- Provided as an example -->
+		<dependency>
+			<groupId>org.alfresco</groupId>
+			<artifactId>alfresco-repository</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>

-    <build>
+	<build>
 		<plugins>
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
@@ -50,33 +50,33 @@
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>
-                        <!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-rad-tile -->
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-rad-tile -->
 						<tile>com.inteligr8.ootbee:beedk-acs-platform-self-rad-tile:${beedkVersion}</tile>
-                        <!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-module-tile -->
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-module-tile -->
 						<tile>com.inteligr8.ootbee:beedk-acs-platform-module-tile:${beedkVersion}</tile>
-                        <!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-it-tile
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-it-tile
 						<tile>com.inteligr8.ootbee:beedk-acs-platform-self-it-tile:${beedkVersion}</tile> -->
 					</tiles>
 				</configuration>
 			</plugin>
 		</plugins>
-    </build>
-    
-    <repositories>
-        <repository>
-            <id>inteligr8-releases</id>
-            <url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
-        </repository>
-        <repository>
-            <id>alfresco-public</id>
-            <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
-        </repository>
-    </repositories>
+	</build>
+	
+	<repositories>
+		<repository>
+			<id>inteligr8-releases</id>
+			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+		</repository>
+		<repository>
+			<id>alfresco-public</id>
+			<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+		</repository>
+	</repositories>

-    <pluginRepositories>
-        <pluginRepository>
-            <id>inteligr8-releases</id>
-            <url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
-        </pluginRepository>
-    </pluginRepositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>inteligr8-releases</id>
+			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+		</pluginRepository>
+	</pluginRepositories>
 </project>
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.ps1
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.ps1
@@ -13,6 +13,11 @@ function start_ {
 	mvn -Drad process-classes
 }

+function start_log {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad "-Ddocker.showLogs" process-classes
+}
+
 function stop_ {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
@@ -41,6 +46,9 @@ switch ($args[0]) {
 	"start" {
 		start_
 	}
+	"start_log" {
+		start_log
+	}
 	"stop" {
 		stop_
 	}
@@ -58,7 +66,7 @@ switch ($args[0]) {
 		list
 	}
 	default {
-		echo "Usage: .\rad.ps1 [ start | stop | restart | rebuild | tail {container} | containers ]"
+		echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
 	}
 }

--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.sh
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.sh
@@ -1,7 +1,7 @@
 #!/bin/sh

 discoverArtifactId() {
-	ARTIFACT_ID=`mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec 2>/dev/null`
+	ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
 }

 rebuild() {
@@ -14,6 +14,11 @@ start() {
 	mvn -Drad process-classes
 }

+start_log() {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad -Ddocker.showLogs process-classes
+}
+
 stop() {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
@@ -38,6 +43,9 @@ case "$1" in
 	start)
 		start
 		;;
+	start_log)
+		start_log
+		;;
 	stop)
 		stop
 		;;
@@ -55,7 +63,7 @@ case "$1" in
 		list
 		;;
 	*)
-		echo "Usage: ./rad.sh [ start | stop | restart | rebuild | tail {container} | containers ]"
+		echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
 		exit 1
 esac

--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleEarlyComponent.java
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleEarlyComponent.java
@@ -1,4 +1,4 @@
-package ${package}.annotation;
+package ${package}.spring;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleLateComponent.java
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleLateComponent.java
@@ -1,4 +1,4 @@
-package ${package}.annotation;
+package ${package}.spring;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml
@@ -1,9 +1,9 @@
 <!-- Documentation: https://docs.alfresco.com/content-services/6.2/develop/reference/web-scripts-ref -->
 <webscript>
-    <shortname>Example Webscript</shortname>
-    <description>Example Java-backed webscript description</description>
-    <url>/exampleJava?paramName={paramValue}</url>
-    <authentication>user</authentication>
-    <format default="json"></format>
-    <family>${shortname}</family>
+	<shortname>Example Webscript</shortname>
+	<description>Example Java-backed webscript description</description>
+	<url>/exampleJava?paramName={paramValue}</url>
+	<authentication>user</authentication>
+	<format default="json"></format>
+	<family>${shortname}</family>
 </webscript>
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml
@@ -1,9 +1,9 @@
 <!-- Documentation: https://docs.alfresco.com/content-services/6.2/develop/reference/web-scripts-ref -->
 <webscript>
-    <shortname>Example Webscript</shortname>
-    <description>Example JS-backed webscript description</description>
-    <url>/exampleJs?paramName={paramValue}</url>
-    <authentication>guest</authentication>
-    <format default="json"></format>
-    <family>${shortname}</family>
+	<shortname>Example Webscript</shortname>
+	<description>Example JS-backed webscript description</description>
+	<url>/exampleJs?paramName={paramValue}</url>
+	<authentication>guest</authentication>
+	<format default="json"></format>
+	<family>${shortname}</family>
 </webscript>
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/dataset/example_v1.xml
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/dataset/example_v1.xml
@@ -0,0 +1,8 @@
+<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0"
+		xmlns:cm="http://www.alfresco.org/model/content/1.0"
+		xmlns:bfs="http://fiscal.treasury.gov/alfresco/model/common/1.0">
+
+	<cm:folder>
+		<cm:name>Example Folder</cm:name>
+	</cm:folder>
+</view:view>
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/messages/example-model.en_US.properties
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/messages/example-model.en_US.properties
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/model/example-model.xml
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/model/example-model.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model name="ootbee:exampleDataModel"
-		xmlns="http://www.alfresco.org/model/dictionary/1.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.alfresco.org/model/dictionary/1.0 https://raw.githubusercontent.com/Alfresco/alfresco-repository/master/src/main/resources/alfresco/model/modelSchema.xsd">
-
-    <description>Example Data Model</description>
-    <author>Order of the Bee</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>
-
-    <namespaces>
-        <namespace uri="http://orderofthebee.org/alfresco/model/example/1.0" prefix="example"/>
-    </namespaces>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="ootbee:exampleDataModel"
+		xmlns="http://www.alfresco.org/model/dictionary/1.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://www.alfresco.org/model/dictionary/1.0 https://raw.githubusercontent.com/Alfresco/alfresco-repository/master/src/main/resources/alfresco/model/modelSchema.xsd">
+
+	<description>Example Data Model</description>
+	<author>Order of the Bee</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>
+
+	<namespaces>
+		<namespace uri="http://orderofthebee.org/alfresco/model/example/1.0" prefix="example"/>
+	</namespaces>
+
 </model>
--- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module-boostrap-context.xml
+++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/groupId.artifactId/module-boostrap-context.xml
@@ -9,7 +9,7 @@

 	<!-- Enable Spring annotation scanning for classes in package -->
 	<context:component-scan base-package="${package}">
-		<context:include-filter type="annotation" expression="${package}.annotation.ModuleEarlyComponent" />
+		<context:include-filter type="annotation" expression="${package}.spring.ModuleEarlyComponent" />
 	</context:component-scan>

 	<!-- Example Data Model loading -->
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/module-context.xml
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/module-context.xml
@@ -9,8 +9,8 @@

 	<!-- Enable Spring annotation scanning for classes in package -->
 	<context:component-scan base-package="${package}">
-		<context:exclude-filter type="annotation" expression="${package}.annotation.ModuleEarlyComponent" />
-		<context:exclude-filter type="annotation" expression="${package}.annotation.ModuleLateComponent" />
+		<context:exclude-filter type="annotation" expression="${package}.spring.ModuleEarlyComponent" />
+		<context:exclude-filter type="annotation" expression="${package}.spring.ModuleLateComponent" />
 	</context:component-scan>
 	
 	<bean id="${project.groupId}.${project.artifactId}.jsroot.example" class="${package}.ExampleJavaScriptRootObject" parent="baseJavaScriptExtension">
@@ -19,4 +19,25 @@
 	
 	<bean id="${project.groupId}.${project.artifactId}.action.example" class="${package}.ExampleActionExecuter" parent="action-executer" />

+	<bean id="${project.groupId}.${project.artifactId}.dataBootstrap_v1.0"
+			class="org.alfresco.repo.module.ImporterModuleComponent" parent="module.baseComponent"
+			depends-on="${project.groupId}.${project.artifactId}.dictionaryBootstrap">
+		
+		<property name="moduleId" value="${project.artifactId}" />
+		<property name="name" value="${project.name} Data" />
+		<property name="description" value="Initial data load for ${project.name}" />
+		<property name="sinceVersion" value="0.1" />
+		<property name="appliesFromVersion" value="0.1" />
+		
+		<property name="importer" ref="spacesBootstrap" />
+		<property name="bootstrapViews">
+			<list>
+				<props>
+					<prop key="path">/${spaces.company_home.childname}</prop>
+					<prop key="location">alfresco/module/${project.groupId}.${project.artifactId}/dataset/example_v1.xml</prop>
+				</props>
+			</list>
+		</property>
+	</bean>
+
 </beans>
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/module-uninstall-context.xml
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/module-uninstall-context.xml
@@ -10,7 +10,7 @@

 	<!-- Enable Spring annotation scanning for classes in package -->
 	<context:component-scan base-package="${package}">
-		<context:include-filter type="annotation" expression="${package}.annotation.ModuleLateComponent" />
+		<context:include-filter type="annotation" expression="${package}.spring.ModuleLateComponent" />
 	</context:component-scan>

 </beans>
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/module.properties
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/module.properties
@@ -1,5 +1,5 @@
-module.id=${project.artifactId}
-#module.aliases=myModule-123, my-module
-module.title=${project.name}
-module.description=${project.description}
-module.version=${project.version}
+module.id=${project.artifactId}
+#module.aliases=myModule-123, my-module
+module.title=${project.name}
+module.description=${project.description}
+module.version=${project.version}
--- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
+++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
@@ -1,63 +1,63 @@
-<?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>
-    <!--
-        To support hot reloading of server side Javascript files in Share, we have to turn on development mode.
-        This setting will tell the Rhinoscript Processor not to compile and cache the JS files.
-        Cool, we can now change server side JS files and have the changes picked up,
-        without having to restart or refresh web scripts.
-
-        But… Due to a known bug in the Surf framework (ALF-9970) this will break the admin consoles in Share.
-
-        Override this bean and disable javascript compilation so that webscripts can be hot reloaded.
-        We have changed the 'compile' property from true to false.
-        -->
-    <bean id="javaScriptProcessor" class="org.alfresco.repo.jscript.RhinoScriptProcessor" init-method="register">
-        <property name="name">
-            <value>javascript</value>
-        </property>
-        <property name="extension">
-            <value>js</value>
-        </property>
-        <!-- Do not "compile javascript and cache compiled scripts" -->
-        <property name="compile">
-            <value>false</value>
-        </property>
-        <!-- allow sharing of sealed scopes for performance -->
-        <!-- disable to give each script it's own new scope which can be extended -->
-        <property name="shareSealedScopes">
-            <value>true</value>
-        </property>
-        <property name="scriptService">
-            <ref bean="scriptService"/>
-        </property>
-        <!-- Creates ScriptNodes which require the ServiceRegistry -->
-        <property name="serviceRegistry">
-            <ref bean="ServiceRegistry"/>
-        </property>
-        <property name="storeUrl">
-            <value>${spaces.store}</value>
-        </property>
-        <property name="storePath">
-            <value>${spaces.company_home.childname}</value>
-        </property>
-    </bean>
-
-
-</beans>
+<?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>
+    <!--
+        To support hot reloading of server side Javascript files in Share, we have to turn on development mode.
+        This setting will tell the Rhinoscript Processor not to compile and cache the JS files.
+        Cool, we can now change server side JS files and have the changes picked up,
+        without having to restart or refresh web scripts.
+
+        But… Due to a known bug in the Surf framework (ALF-9970) this will break the admin consoles in Share.
+
+        Override this bean and disable javascript compilation so that webscripts can be hot reloaded.
+        We have changed the 'compile' property from true to false.
+        -->
+    <bean id="javaScriptProcessor" class="org.alfresco.repo.jscript.RhinoScriptProcessor" init-method="register">
+        <property name="name">
+            <value>javascript</value>
+        </property>
+        <property name="extension">
+            <value>js</value>
+        </property>
+        <!-- Do not "compile javascript and cache compiled scripts" -->
+        <property name="compile">
+            <value>false</value>
+        </property>
+        <!-- allow sharing of sealed scopes for performance -->
+        <!-- disable to give each script it's own new scope which can be extended -->
+        <property name="shareSealedScopes">
+            <value>true</value>
+        </property>
+        <property name="scriptService">
+            <ref bean="scriptService"/>
+        </property>
+        <!-- Creates ScriptNodes which require the ServiceRegistry -->
+        <property name="serviceRegistry">
+            <ref bean="ServiceRegistry"/>
+        </property>
+        <property name="storeUrl">
+            <value>${spaces.store}</value>
+        </property>
+        <property name="storePath">
+            <value>${spaces.company_home.childname}</value>
+        </property>
+    </bean>
+
+
+</beans>
--- a/beedk-acs-platform-module-tile/pom.xml
+++ b/beedk-acs-platform-module-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-module-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: ACS Platform Module</name>
--- a/beedk-acs-platform-rad-tile/README.md
+++ b/beedk-acs-platform-rad-tile/README.md
@@ -49,12 +49,17 @@ The following properties are intended to be exposed by inheriting Public API Mav

 | Maven Property             | Required | Default         | Description |
 | -------------------------- |:--------:| --------------- | ----------- |
+| `acs-platform.hotswap.enabled` |      | true            | Enable the HotSwap Agent for live classpath reloading. |
+| `acs-platform.hotswap.disablePlugins` | | Hibernate     | Do not enable the HotSwap Agent with the following plugins.  All plugins are documented here: https://github.com/HotswapProjects/HotswapAgent/tree/master/plugin |
+| `acs-platform.debugger.enabled` |     | true            | Enable the JDWP debugger. |
 | `acs-platform.port`        |          | 8080            | The port to expose on `localhost` for the developer; not for other applications or users. |
 | `acs-postgres.port`        |          | 5432            | The port to expose on `localhost` for the developer; not for other applications or users. |
 | `acs-activemq.port`        |          | 8161            | The port to expose on `localhost` for the developer; not for other applications or users. |
 | `acs-platform.debugger.port` |        | 8000            | The port to expose on `localhost` for the developer; not for other applications or users. |
 | `acs-platform.tomcat.opts` |          |                 | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.* |
 | `acs-platform.timeout`     |          | 120000          | The time to wait for the startup to complete, in milliseconds. |
+| `alfresco.license.directory` |  | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. |
+| `acs.license.directory`    |  | `${alfresco.license.directory}/acs` | The base path to search for an ACS license. |
 | `tomcat-rad.version`       |          | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
 | `acs-postgres.version`     |          | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
 | `acs-activemq.version`     |          | *not important* | The version of Alfresco ActiveMQ to use in the integration testing infrastructure. |
--- a/beedk-acs-platform-rad-tile/pom.xml
+++ b/beedk-acs-platform-rad-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-rad-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: RAD for ACS Platform Core</name>
--- a/beedk-acs-platform-rad-tile/tile.xml
+++ b/beedk-acs-platform-rad-tile/tile.xml
@@ -16,7 +16,7 @@
 					<!-- This plugin downloads ancillary WARs -->
 					<plugin>
 						<artifactId>maven-dependency-plugin</artifactId>
-						<version>3.1.2</version>
+						<version>3.2.0</version>
 						<executions>
 							<!-- This execution downloads the API Explorer WAR -->
 							<execution>
@@ -103,12 +103,15 @@
 											<run>
 												<env>
 													<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
+													<ENABLE_JDWP>${acs-platform.debugger.enabled}</ENABLE_JDWP>
+													<ENABLE_HOTSWAP>${acs-platform.hotswap.enabled}</ENABLE_HOTSWAP>
+													<DISABLE_HOTSWAP_PLUGINS>${acs-platform.hotswap.disablePlugins}</DISABLE_HOTSWAP_PLUGINS>
 													<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
 														-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
 														-Dtransform.service.enabled=${beedk.rad.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
 														-Dlocal.transform.service.enabled=${beedk.rad.alts.enabled} \
 														-DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \
-														-Djodconverter.enabled=false \
+														-Djodconverter.enabled=false -Dsystem.workflow.engine.activiti.enabled=true \
 														-Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 -Dimg.url=http://${project.artifactId}-ate-aio:8090 -Dtika.url=http://${project.artifactId}-ate-aio:8090 -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \
 														-Dindex.subsystem.name=${beedk.rad.platform.index} -Dsolr.host=${project.artifactId}-acs-search -Dsolr.secureComms=none \
 														${acs-platform.tomcat.opts}</CATALINA_OPTS>
@@ -123,6 +126,7 @@
 												</network>
 												<volumes>
 													<bind>
+														<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
 														<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
 														<volume>${beedk.deploy.api-explorer.warFile}:/var/lib/tomcat/webapps/api-explorer.war:ro</volume>
 														<volume>${beedk.deploy.aos.warFile}:/var/lib/tomcat/webapps/_vti_bin.war:ro</volume>
@@ -230,11 +234,16 @@
 				<beedk.deploy.platform.warDirectory>${project.build.warDirectory}</beedk.deploy.platform.warDirectory>
 				<acs-platform.timeout>150000</acs-platform.timeout>
 				<acs-platform.memory>1g</acs-platform.memory>
+				<acs-platform.debugger.enabled>true</acs-platform.debugger.enabled>
+				<acs-platform.hotswap.enabled>true</acs-platform.hotswap.enabled>
+				<acs-platform.hotswap.disablePlugins>Hibernate</acs-platform.hotswap.disablePlugins>
 				<acs-api-explorer.war.groupId>org.alfresco</acs-api-explorer.war.groupId>
 				<acs-api-explorer.war.artifactId>api-explorer</acs-api-explorer.war.artifactId>
 				<acs-api-explorer.war.version>${acs-api-explorer.version}</acs-api-explorer.war.version>
 				<beedk.deploy.api-explorer.warFile>${beedk.deploy.platform.warDirectory}/${acs-api-explorer.war.artifactId}-${acs-api-explorer.war.version}.war</beedk.deploy.api-explorer.warFile>
 				<beedk.deploy.aos.warFile>${beedk.deploy.platform.warDirectory}/alfresco-vti-bin-${acs-aos.war.version}.war</beedk.deploy.aos.warFile>
+				<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
+				<acs.license.directory>${alfresco.license.directory}/acs</acs.license.directory>

 				<!-- ports -->
 				<acs-postgres.port>5432</acs-postgres.port>
@@ -247,7 +256,7 @@
 				<acs-aos.war.version>1.3.2.1</acs-aos.war.version>
 				<acs-postgres.version>9.6</acs-postgres.version>
 				<acs-activemq.version>5.15.8</acs-activemq.version>
-				<tomcat-rad.version>9-1.3</tomcat-rad.version>
+				<tomcat-rad.version>9-1.4</tomcat-rad.version>
 			</properties>
 		</profile>
 	</profiles>
--- a/beedk-acs-platform-self-it-tile/pom.xml
+++ b/beedk-acs-platform-self-it-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-self-it-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: Integration Testing for ACS Platform</name>
--- a/beedk-acs-platform-self-it-tile/tile.xml
+++ b/beedk-acs-platform-self-it-tile/tile.xml
@@ -8,7 +8,7 @@
 			<!-- This plugin downloads the Platform JAR-based extension modules and runtime/test dependencies -->
 			<plugin>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.2</version>
+				<version>3.2.0</version>
 				<executions>
 					<!-- This execution downloads the dependency JARs, including JAR modules -->
 					<execution>
--- a/beedk-acs-platform-self-rad-tile/README.md
+++ b/beedk-acs-platform-self-rad-tile/README.md
@@ -60,11 +60,10 @@ The following properties are intended to be exposed by inheriting Public API Mav

 | Maven Property                     | Required | Default            | Description |
 | ---------------------------------- |:--------:| ------------------ | ----------- |
-| `alfresco.sdk.version`             | **YES**  |                    | For a list of versions and more details, see the [Alfresco SDK](https://github.com/Alfresco/alfresco-sdk).<br/>*Inherited from [`beedk-acs-webapp-artifact-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-aritfact-rad-tile)* |
+| `alfresco.sdk.version`             | **YES**  |                    | For a list of versions and more details, see the [Alfresco SDK](https://github.com/Alfresco/alfresco-sdk).<br/>*Inherited from [`beedk-acs-webapp-artifact-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-rad-tile)* |
 | `alfresco.platform.version`        | *Maybe*  |                    | The Alfresco Platform version to use for RAD.  See below for more details. |
 | `edition`                          |          | `community`        | The Alfresco Platform edition used for RAD.  `community` or `enterprise`.  See below for more details. |
 | `alfresco.war.version`             | *Maybe*  | *See Below*        | The Maven `version` of a Maven `war` Type Project defined in a Maven Repository.<br/>*Inherited from [`beedk-acs-webapp-artifact-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-tile)* |
-| `project.build.extDirectory`       |  | `${project.build.directory}/ext/platform` | An additional directory of JARs to add to the ACS Platform at runtime. |
 | `acs-platform.port`                |          | 8080               | The port to expose on `localhost` for the developer; not for other applications or users.<br/>*Inherited from [`beedk-acs-platform-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-rad-tile)* |
 | `acs-platform.debugger.port`       |          | 8000               | The port to expose on `localhost` for the developer; not for other applications or users.<br/>*Inherited from [`beedk-acs-platform-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-rad-tile)* |
 | `acs-postgres.port`                |          | 5432               | The port to expose on `localhost` for the developer; not for other applications or users.<br/>*Inherited from [`beedk-acs-platform-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-rad-tile)* |
--- a/beedk-acs-platform-self-rad-tile/pom.xml
+++ b/beedk-acs-platform-self-rad-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-self-rad-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: RAD for ACS Platform</name>
--- a/beedk-acs-platform-self-rad-tile/tile.xml
+++ b/beedk-acs-platform-self-rad-tile/tile.xml
@@ -16,7 +16,7 @@
 					<!-- This plugin downloads the Platform JAR-based extension modules and runtime/test dependencies -->
 					<plugin>
 						<artifactId>maven-dependency-plugin</artifactId>
-						<version>3.1.2</version>
+						<version>3.2.0</version>
 						<executions>
 							<!-- This execution downloads the dependency JARs, including JAR modules -->
 							<execution>
--- a/beedk-acs-platform-sibling-it-tile/pom.xml
+++ b/beedk-acs-platform-sibling-it-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-sibling-it-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: Integration Testing for ACS Platform by Maven Sibling Project</name>
--- a/beedk-acs-platform-sibling-rad-tile/pom.xml
+++ b/beedk-acs-platform-sibling-rad-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-sibling-rad-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: RAD for ACS Platform by Maven Sibling Project</name>
--- a/beedk-acs-platform-webapp-docker-tile/.gitignore
+++ b/beedk-acs-platform-webapp-docker-tile/.gitignore
@@ -0,0 +1,9 @@
+# Eclipse
+.project
+.classpath
+.settings
+
+# Maven
+pom.xml.versionsBackup
+target
+
--- a/beedk-acs-platform-webapp-docker-tile/Dockerfile
+++ b/beedk-acs-platform-webapp-docker-tile/Dockerfile
@@ -0,0 +1,17 @@
+FROM alfresco/alfresco-content-repository-community:${alfresco.platfrom.version}
+
+ARG USERNAME=alfresco
+ARG TOMCAT_DIR=/usr/local/tomcat
+
+USER root
+
+COPY catalina.policy /tmp/catalina.policy.ext
+COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.xml
+
+RUN mkdir -p ${TOMCAT_DIR}/modules/platform && \
+        cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
+
+COPY war/${alfresco.war.artifactId}-${alfresco.war.version}.war ${TOMCAT_DIR}/webapps/alfresco.war
+COPY ext/platform/*.jar ${TOMCAT_DIR}/modules/platform/
+
+USER ${USERNAME}
--- a/beedk-acs-platform-webapp-docker-tile/README.md
+++ b/beedk-acs-platform-webapp-docker-tile/README.md
--- a/beedk-acs-platform-webapp-docker-tile/catalina.policy
+++ b/beedk-acs-platform-webapp-docker-tile/catalina.policy
@@ -0,0 +1,4 @@
+grant codeBase "file:${catalina.base}/modules/-" {
+    permission java.security.AllPermission;
+};
+
--- a/beedk-acs-platform-webapp-docker-tile/pom.xml
+++ b/beedk-acs-platform-webapp-docker-tile/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.inteligr8.ootbee</groupId>
+	<artifactId>beedk-acs-platform-webapp-docker-tile</artifactId>
+	<version>1.0.11</version>
+	<packaging>tile</packaging>
+
+	<name>Order of the Bee Development Kit: ACS Platform Web Application Docker Enablement</name>
+	<scm>
+		<url>https://bitbucket.org/inteligr8/ootbee-beedk</url>
+	</scm>
+	<organization>
+		<name>Order of the Bee</name>
+		<url>https://orderofthebee.net</url>
+	</organization>
+	<developers>
+		<developer>
+			<name>Brian Long</name>
+			<email>brian@inteligr8.com</email>
+			<organization>Inteligr8</organization>
+			<organizationUrl>https://www.inteligr8.com</organizationUrl>
+			<url>https://twitter.com/brianmlong</url>
+		</developer>
+	</developers>
+	
+    <build>
+		<plugins>
+			<plugin>
+				<groupId>io.repaint.maven</groupId>
+				<artifactId>tiles-maven-plugin</artifactId>
+				<version>2.20</version>
+				<extensions>true</extensions>
+				<configuration>
+					<filtering>true</filtering>
+					<tiles>
+						<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>
+					</tiles>
+				</configuration>
+			</plugin>
+		</plugins>
+    </build>
+
+</project>
--- a/beedk-acs-platform-webapp-docker-tile/tile.xml
+++ b/beedk-acs-platform-webapp-docker-tile/tile.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://bitbucket.org/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">
+
+	<profiles>
+		<profile>
+			<id>scaffold-acs-platform-webapp-docker</id>
+			<activation>
+				<property>
+					<name>scaffold</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<!-- This plugin downloads the required configurations for all modules -->
+					<plugin>
+						<groupId>com.googlecode.maven-download-plugin</groupId>
+						<artifactId>download-maven-plugin</artifactId>
+						<version>1.6.1</version>
+						<executions>
+                            <!-- TODO eventually replace these with the archetype versions -->
+							<execution>
+								<id>download-dockerfile</id>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>wget</goal>
+								</goals>
+								<configuration>
+									<url>https://bitbucket.org/inteligr8/ootbee-beedk/raw/stable/beedk-acs-platform-webapp-docker-tile/Dockerfile</url>
+									<outputDirectory>${basedir}/src/main/docker</outputDirectory>
+								</configuration>
+							</execution>
+							<execution>
+								<id>download-policy</id>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>wget</goal>
+								</goals>
+								<configuration>
+									<url>https://bitbucket.org/inteligr8/ootbee-beedk/raw/stable/beedk-acs-platform-webapp-docker-tile/catalina.policy</url>
+									<outputDirectory>${basedir}/src/main/docker</outputDirectory>
+								</configuration>
+							</execution>
+							<execution>
+								<id>download-context</id>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>wget</goal>
+								</goals>
+								<configuration>
+									<url>https://bitbucket.org/inteligr8/ootbee-beedk/raw/stable/beedk-acs-platform-webapp-docker-tile/tomcat-platform-context.xml</url>
+									<outputDirectory>${basedir}/src/main/docker</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+	<tiles>
+		<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-docker-tile -->
+		<tile>@project.groupId@:beedk-acs-webapp-docker-tile:@project.version@</tile>
+	</tiles>
+
+</project>
--- a/beedk-acs-platform-webapp-docker-tile/tomcat-platform-context.xml
+++ b/beedk-acs-platform-webapp-docker-tile/tomcat-platform-context.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Context>
+        <Resources>
+                <PreResources base="${catalina.base}/modules/platform" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
+        </Resources>
+</Context>
--- a/beedk-acs-platform-webapp-tile/pom.xml
+++ b/beedk-acs-platform-webapp-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-platform-webapp-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: ACS Platform Web Application</name>
--- a/beedk-acs-search-it-tile/pom.xml
+++ b/beedk-acs-search-it-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-search-it-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: Integration Testing for Alfresco Search Services</name>
--- a/beedk-acs-search-rad-tile/pom.xml
+++ b/beedk-acs-search-rad-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-search-rad-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: RAD for Alfresco Search Services</name>
--- a/beedk-acs-share-artifact-rad-tile/.gitignore
+++ b/beedk-acs-share-artifact-rad-tile/.gitignore
@@ -0,0 +1,9 @@
+# Eclipse
+.project
+.classpath
+.settings
+
+# Maven
+pom.xml.versionsBackup
+target
+
--- a/beedk-acs-share-artifact-rad-tile/README.md
+++ b/beedk-acs-share-artifact-rad-tile/README.md
@@ -0,0 +1,82 @@
+# BeeDK ACS Share RAD Maven Tile for non-Share-accessible Projects
+
+This is a component within the proposed [BeeDK](/inteligr8/ootbee-beedk).  It is considered to be part of the **Public API** of the BeeDK.
+
+## Purpose
+
+This project creates a [Maven Tile](https://github.com/repaint-io/maven-tiles) that provides the basis for rapid application development any Maven project against the ACS Platform.
+
+## Usage
+
+To use this plugin, just reference it with the Maven Tiles plugin as shown in the following snippet.  Do not forget the `extensions` element in the *plugin* configuration.
+
+```xml
+<project ...>
+	...
+	<build>
+		...
+		<plugins>
+			<plugin>
+				<groupId>io.repaint.maven</groupId>
+				<artifactId>tiles-maven-plugin</artifactId>
+				<version>[2.0,3.0)</version>
+				<extensions>true</extensions>
+				<configuration>
+					<tiles>
+						...
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-artifact-rad-tile -->
+						<tile>com.inteligr8.ootbee:beedk-acs-share-artifact-rad-tile:[1.0.0,2.0.0)</tile>
+					</tiles>
+				</configuration>
+			</plugin>
+			...
+		</plugins>
+		...
+	</build>
+	...
+</project>
+```
+
+There are 2 other alternative tiles that serve a similar purpose, but are for other use cases.  Make sure you are using the right one.  Follow the logic below.
+
+Is your Maven project an ACS Share module or ACS Share web application?
+: You will be declaring the `beedk-acs-share-module-tile` or `beedk-acs-share-webapp-tile` Maven Tile.  You will need to explicitly declare and configure the [`beedk-acs-share-self-rad-tile` Maven Tile](../beedk-acs-share-self-rad-tile).
+
+Is your Maven project just one within a set of other Maven projects AND one of those other Maven projects is an ACS Share web application (not a module)?
+: You will need to explicitly declare and configure the [`beedk-acs-share-sibling-rad-tile` Maven Tile](../beedk-acs-share-sibling-rad-tile).
+
+Otherwise
+: You will need to explicitly declare and configure the `beedk-acs-share-artifact-rad-tile` Maven Tile.
+
+See the [BeeDK documentation](/inteligr8/ootbee-beedk) on instructions for how to start and stop RAD capabilities.
+
+## Configuration
+
+In your Maven project, set the following properties to define the behavior of this Maven Tile.  Unless otherwise stated, they can only be overridden in the project POM or other Maven Tiles loaded earlier than this Maven Tile.
+
+### Public API
+
+The following properties are intended to be exposed by inheriting Public API Maven Tiles.
+
+| Maven Property                     | Required | Default            | Description |
+| ---------------------------------- |:--------:| ------------------ | ----------- |
+| `alfresco.share.version`           | Maybe    |                    | The Alfresco Share version to use for RAD.  See below for more details. |
+| `alfresco.share.war.groupId`       |          | `org.alfresco`     | The Maven `groupId` of a Maven `war` Type Project defined in a Maven Repository. |
+| `alfresco.share.war.artifactId`    |          | `share`            | The Maven `artifactId` of a Maven `war` Type Project defined in a Maven Repository. |
+| `alfresco.share.war.version`       | Maybe    | *See Below*        | The Maven `version` of a Maven `war` Type Project defined in a Maven Repository. |
+| `acs-share.port`                   |          | 8180               | The port to expose on `localhost` for the developer; not for other applications or users.<br/>*Inherited from [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)* |
+| `acs-share.debugger.port`          |          | 8100               | The port to expose on `localhost` for the developer; not for other applications or users.<br/>*Inherited from [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)* |
+| `acs-share.tomcat.opts`            |          |                    | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.*<br/>*Inherited from [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)* |
+
+*   The `alfresco.share.version` is used to default the `alfresco.share.war.version`.  It is expected to be used by other Maven Tiles, so it is here for convenience.  You must specify either property for this tile to function.
+
+
+### Other APIs
+
+Additional less important configurations are inherited from the following Maven Tiles.
+
+*   [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)
+
+## Results
+
+The ACS Share component will be started during the `process-classes` Maven phase.
--- a/beedk-acs-share-artifact-rad-tile/pom.xml
+++ b/beedk-acs-share-artifact-rad-tile/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.inteligr8.ootbee</groupId>
+	<artifactId>beedk-acs-share-artifact-rad-tile</artifactId>
+	<version>1.0.11</version>
+	<packaging>tile</packaging>
+
+	<name>Order of the Bee Development Kit: RAD for ACS Share by Maven Artifact</name>
+	<scm>
+		<url>https://bitbucket.org/inteligr8/ootbee-beedk</url>
+	</scm>
+	<organization>
+		<name>Order of the Bee</name>
+		<url>https://orderofthebee.net</url>
+	</organization>
+	<developers>
+		<developer>
+			<name>Brian Long</name>
+			<email>brian@inteligr8.com</email>
+			<organization>Inteligr8</organization>
+			<organizationUrl>https://www.inteligr8.com</organizationUrl>
+			<url>https://twitter.com/brianmlong</url>
+		</developer>
+	</developers>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>io.repaint.maven</groupId>
+				<artifactId>tiles-maven-plugin</artifactId>
+				<version>2.20</version>
+				<extensions>true</extensions>
+				<configuration>
+					<filtering>true</filtering>
+					<tiles>
+						<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>
+					</tiles>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
--- a/beedk-acs-share-artifact-rad-tile/tile.xml
+++ b/beedk-acs-share-artifact-rad-tile/tile.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0"
+ 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 		xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://bitbucket.org/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">
+	
+	<profiles>
+		<profile>
+			<id>rad-acs-share-artifact</id>
+			<activation>
+				<property>
+					<name>rad</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<!-- This plugin downloads the Share WAR -->
+					<plugin>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<version>3.2.0</version>
+						<executions>
+							<!-- This execution downloads the Share WAR -->
+							<execution>
+								<id>download-platform-webapp</id>
+								<phase>generate-resources</phase>
+								<goals><goal>copy</goal></goals>
+								<configuration>
+									<artifactItems>
+										<artifactItem>
+											<groupId>${alfresco.share.war.groupId}</groupId>
+											<artifactId>${alfresco.share.war.artifactId}</artifactId>
+											<version>${alfresco.share.war.version}</version>
+											<type>war</type>
+										</artifactItem>
+									</artifactItems>
+									<outputDirectory>${beedk.deploy.share.warDirectory}</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>default-props</id>
+			<activation>
+				<property>
+					<name>!some-prop-that-never-exists</name>
+				</property>
+			</activation>
+			<properties>
+				<!-- configurable -->
+				<project.build.warDirectory>${project.build.directory}/war</project.build.warDirectory>
+				<alfresco.share.war.groupId>org.alfresco</alfresco.share.war.groupId>
+				<alfresco.share.war.artifactId>share</alfresco.share.war.artifactId>
+				<alfresco.share.war.version>${alfresco.share.version}</alfresco.share.war.version>
+
+				<!-- configuring beedk-acs-share-rad-tile -->
+				<beedk.deploy.share.warFile>${project.build.warDirectory}/${alfresco.share.war.artifactId}-${alfresco.share.war.version}.war</beedk.deploy.share.warFile>
+				<beedk.deploy.share.extDirectory>${project.build.directory}/ext/share</beedk.deploy.share.extDirectory>
+			</properties>
+		</profile>
+	</profiles>
+	
+	<tiles>
+		<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile -->
+		<tile>@project.groupId@:beedk-acs-share-rad-tile:@project.version@</tile>
+	</tiles>
+
+</project>
--- a/beedk-acs-share-module-archetype/pom.xml
+++ b/beedk-acs-share-module-archetype/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-share-module-archetype</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>maven-archetype</packaging>

 	<name>Order of the Bee Development Kit: Project Scaffolding for an ACS Share Module</name>
--- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,50 +1,50 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <version>${version}</version>
-    <packaging>jar</packaging>
-    
-    <name>${shortname} ACS Share Module</name>
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<version>${version}</version>
+	<packaging>jar</packaging>
+	
+	<name>${shortname} ACS Share Module</name>

-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    	<maven.compiler.source>8</maven.compiler.source>
-    	<maven.compiler.target>8</maven.compiler.target>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>

 		<alfresco.sdk.version>4.2.0</alfresco.sdk.version>
-        <alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
-        <alfresco.share.version>6.2.2</alfresco.share.version>
-    </properties>
+		<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
+		<alfresco.share.version>6.2.2</alfresco.share.version>
+	</properties>

-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>acs-community-packaging</artifactId>
-                <version>${alfresco.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.alfresco</groupId>
+				<artifactId>acs-community-packaging</artifactId>
+				<version>${alfresco.platform.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>

-    <dependencies>
-        <!-- Very popular, but not required, dependency -->
-        <!-- Provided as an example -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>share</artifactId>
-            <version>${alfresco.share.version}</version>
-            <classifier>classes</classifier>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<!-- Very popular, but not required, dependency -->
+		<!-- Provided as an example -->
+		<dependency>
+			<groupId>org.alfresco</groupId>
+			<artifactId>share</artifactId>
+			<version>${alfresco.share.version}</version>
+			<classifier>classes</classifier>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>

-    <build>
+	<build>
 		<plugins>
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
@@ -53,35 +53,35 @@
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>
-                        <!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-self-rad-tile -->
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-self-rad-tile -->
 						<tile>com.inteligr8.ootbee:beedk-acs-share-self-rad-tile:${beedkVersion}</tile>
 						<tile>com.inteligr8.ootbee:beedk-acs-platform-artifact-rad-tile:${beedkVersion}</tile>
-                        <!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-module-tile -->
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-module-tile -->
 						<tile>com.inteligr8.ootbee:beedk-acs-share-module-tile:${beedkVersion}</tile>
-                        <!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-self-it-tile
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-self-it-tile
 						<tile>com.inteligr8.ootbee:beedk-acs-share-self-it-tile:${beedkVersion}</tile>
 						<tile>com.inteligr8.ootbee:beedk-acs-share-artifact-it-tile:${beedkVersion}</tile> -->
 					</tiles>
 				</configuration>
 			</plugin>
 		</plugins>
-    </build>
-    
-    <repositories>
-        <repository>
-            <id>inteligr8-releases</id>
-            <url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
-        </repository>
-        <repository>
-            <id>alfresco-public</id>
-            <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
-        </repository>
-    </repositories>
+	</build>
+	
+	<repositories>
+		<repository>
+			<id>inteligr8-releases</id>
+			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+		</repository>
+		<repository>
+			<id>alfresco-public</id>
+			<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+		</repository>
+	</repositories>

-    <pluginRepositories>
-        <pluginRepository>
-            <id>inteligr8-releases</id>
-            <url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
-        </pluginRepository>
-    </pluginRepositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>inteligr8-releases</id>
+			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+		</pluginRepository>
+	</pluginRepositories>
 </project>
--- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.ps1
+++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.ps1
@@ -13,6 +13,11 @@ function start_ {
 	mvn -Drad process-classes
 }

+function start_log {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad "-Ddocker.showLogs" process-classes
+}
+
 function stop_ {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
@@ -41,6 +46,9 @@ switch ($args[0]) {
 	"start" {
 		start_
 	}
+	"start_log" {
+		start_log
+	}
 	"stop" {
 		stop_
 	}
@@ -58,7 +66,7 @@ switch ($args[0]) {
 		list
 	}
 	default {
-		echo "Usage: .\rad.ps1 [ start | stop | restart | rebuild | tail {container} | containers ]"
+		echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
 	}
 }

--- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.sh
+++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.sh
@@ -1,7 +1,7 @@
 #!/bin/sh

 discoverArtifactId() {
-	ARTIFACT_ID=`mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec 2>/dev/null`
+	ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
 }

 rebuild() {
@@ -14,6 +14,11 @@ start() {
 	mvn -Drad process-classes
 }

+start_log() {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad -Ddocker.showLogs process-classes
+}
+
 stop() {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
@@ -38,6 +43,9 @@ case "$1" in
 	start)
 		start
 		;;
+	start_log)
+		start_log
+		;;
 	stop)
 		stop
 		;;
@@ -55,7 +63,7 @@ case "$1" in
 		list
 		;;
 	*)
-		echo "Usage: ./rad.sh [ start | stop | restart | rebuild | tail {container} | containers ]"
+		echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
 		exit 1
 esac

--- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml
+++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml
@@ -1,334 +1,334 @@
-<alfresco-config>
-
-	<config evaluator="string-compare" condition="DocumentLibrary">
-		<aspects>
-			<visible>
-				<aspect name="example:aspect" />
-			</visible>
-			<addable> <!-- defaults to visible config -->
-			</addable>
-			<removeable> <!-- defaults to visible config -->
-			</removeable>
-		</aspects>
-		<types>
-			<type name="cm:content">
-				<subtype name="example:document"/>
-			</type>
-		</types>
-	</config>
-
-	<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.exampleDocument" descriptionId="form.description.advancedsearch.exampleDocument">example:document</form>
-			</forms>
-		</advanced-search>
-	</config>
-	
-	<config evaluator="node-type" condition="example: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"/>
-				</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"/>
-
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</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"/>
-				</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>
-
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</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"/>
-				</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>
-
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</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"/>
-				</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>
-					
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</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"/>
-				</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>
-
-					<!-- Example Properties -->
-					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
-				</appearance>
-			</form>
-		</forms>
-	</config>
-
-</alfresco-config>
+<alfresco-config>
+
+	<config evaluator="string-compare" condition="DocumentLibrary">
+		<aspects>
+			<visible>
+				<aspect name="example:aspect" />
+			</visible>
+			<addable> <!-- defaults to visible config -->
+			</addable>
+			<removeable> <!-- defaults to visible config -->
+			</removeable>
+		</aspects>
+		<types>
+			<type name="cm:content">
+				<subtype name="example:document"/>
+			</type>
+		</types>
+	</config>
+
+	<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.exampleDocument" descriptionId="form.description.advancedsearch.exampleDocument">example:document</form>
+			</forms>
+		</advanced-search>
+	</config>
+	
+	<config evaluator="node-type" condition="example: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"/>
+				</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"/>
+
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</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"/>
+				</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>
+
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</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"/>
+				</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>
+
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</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"/>
+				</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>
+					
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</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"/>
+				</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>
+
+					<!-- Example Properties -->
+					<set id="exampleDocumentSet" appearance="bordered-panel" label-id="form.set.label.example.document"/>
+				</appearance>
+			</form>
+		</forms>
+	</config>
+
+</alfresco-config>
--- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/module.properties
+++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/groupId.artifactId/module.properties
@@ -1,5 +1,5 @@
-module.id=${project.artifactId}
-#module.aliases=myModule-123, my-module
-module.title=${project.name}
-module.description=${project.description}
-module.version=${project.version}
+module.id=${project.artifactId}
+#module.aliases=myModule-123, my-module
+module.title=${project.name}
+module.description=${project.description}
+module.version=${project.version}
--- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/groupId.artifactId-context.xml
+++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/groupId.artifactId-context.xml
@@ -10,30 +10,30 @@
 	<!-- Enable Spring annotation scanning for classes in package -->
 	<context:component-scan base-package="${package}" />
 	
-    <bean id="${project.groupId}.${project.artifactId}.resources" class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
-        <property name="resourceBundles">
-            <list>
-                <value>${alfresco.ext.package}.messages.example</value>
-            </list>
-        </property>
-    </bean>
+	<bean id="${project.groupId}.${project.artifactId}.resources" class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
+		<property name="resourceBundles">
+			<list>
+				<value>${alfresco.ext.package}.messages.example</value>
+			</list>
+		</property>
+	</bean>

 	<!-- An example Action Evaluator -->
-    <bean id="evaluator.doclib.action.isMarkdown" parent="evaluator.doclib.action.isMimetype">
-       <property name="mimetypes">
-          <list>
-             <value>text/x-markdown</value>
-          </list>
-       </property>
-    </bean>
+	<bean id="evaluator.doclib.action.isMarkdown" parent="evaluator.doclib.action.isMimetype">
+	   <property name="mimetypes">
+		  <list>
+			 <value>text/x-markdown</value>
+		  </list>
+	   </property>
+	</bean>

 	<!-- An example Extensibility Module Evaluator -->
-    <bean id="moduleEvaluator.doclib.action.isMarkdown" parent="moduleEvaluator.doclib.action.isMimetype">
-       <property name="mimetypes">
-          <list>
-             <value>text/x-markdown</value>
-          </list>
-       </property>
-    </bean>
-    
+	<bean id="moduleEvaluator.doclib.action.isMarkdown" parent="moduleEvaluator.doclib.action.isMimetype">
+	   <property name="mimetypes">
+		  <list>
+			 <value>text/x-markdown</value>
+		  </list>
+	   </property>
+	</bean>
+	
 </beans>
--- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/META-INF/share-config-custom.xml
+++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/META-INF/share-config-custom.xml
@@ -1,95 +1,95 @@
-<alfresco-config>
-
-    <config evaluator="string-compare" condition="WebFramework">
-        <web-framework>
-            <autowire>
-                <!-- Changing this to 'development' currently breaks the Admin Console.
-                     Instead we make a POST to clear Share dependency caches, see 'clear-caches-refresh-ws' profile. -->
-                <mode>production</mode> <!-- not really need in the long run, used for YUI - deprecate -->
-            </autowire>
-
-            <!--
-                 We don't need to do this when we have the new refresh mojos in the Alfresco plug-in.
-
-                 If resource caching has been disabled then all the dependency caches will be cleared
-                 before processing the Aikau jsonModel request...
-                    (i.e. this.dojoDependencyHandler.clearCaches() )
-
-                 For more information see the Aikau source code: https://github.com/Alfresco/Aikau
-            -->
-            <disable-resource-caching>true</disable-resource-caching>
-        </web-framework>
-    </config>
-
-
-    <!-- Global config section -->
-    <config replace="true">
-        <flags>
-            <!--
-               Developer debugging setting to turn on DEBUG mode for client scripts in the browser
-            -->
-            <client-debug>true</client-debug>
-            <!--
-               LOGGING can always be toggled at runtime when in DEBUG mode (Ctrl, Ctrl, Shift, Shift).
-               This flag automatically activates logging on page load.
-            -->
-            <client-debug-autologging>false</client-debug-autologging>
-        </flags>
-    </config>
-
-    <!--
-        Disable CSRF completely for now
-        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
-        -->
-    <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-        <filter/>
-    </config>
-
-
-    <!--
-        Change so it is picked up from property where the Alfresco Repo Webapp is running
-        (e.g. http://localhost:8080/alfresco)
-        -->
-    <config evaluator="string-compare" condition="Remote">
-        <remote>
-            <endpoint>
-                <id>alfresco-noauth</id>
-                <name>Alfresco - unauthenticated access</name>
-                <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
-                <identity>none</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco</id>
-                <name>Alfresco - user access</name>
-                <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
-                <identity>user</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco-feed</id>
-                <name>Alfresco Feed</name>
-                <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
-                <connector-id>http</connector-id>
-                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
-                <basic-auth>true</basic-auth>
-                <identity>user</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco-api</id>
-                <parent-id>alfresco</parent-id>
-                <name>Alfresco Public API - user access</name>
-                <description>Access to Alfresco Repository Public API that require user authentication.
-                    This makes use of the authentication that is provided by parent 'alfresco' endpoint.</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${acs-platform.url}/alfresco/api</endpoint-url>
-                <identity>user</identity>
-            </endpoint>
-        </remote>
-    </config>
-</alfresco-config>
+<alfresco-config>
+
+    <config evaluator="string-compare" condition="WebFramework">
+        <web-framework>
+            <autowire>
+                <!-- Changing this to 'development' currently breaks the Admin Console.
+                     Instead we make a POST to clear Share dependency caches, see 'clear-caches-refresh-ws' profile. -->
+                <mode>production</mode> <!-- not really need in the long run, used for YUI - deprecate -->
+            </autowire>
+
+            <!--
+                 We don't need to do this when we have the new refresh mojos in the Alfresco plug-in.
+
+                 If resource caching has been disabled then all the dependency caches will be cleared
+                 before processing the Aikau jsonModel request...
+                    (i.e. this.dojoDependencyHandler.clearCaches() )
+
+                 For more information see the Aikau source code: https://github.com/Alfresco/Aikau
+            -->
+            <disable-resource-caching>true</disable-resource-caching>
+        </web-framework>
+    </config>
+
+
+    <!-- Global config section -->
+    <config replace="true">
+        <flags>
+            <!--
+               Developer debugging setting to turn on DEBUG mode for client scripts in the browser
+            -->
+            <client-debug>true</client-debug>
+            <!--
+               LOGGING can always be toggled at runtime when in DEBUG mode (Ctrl, Ctrl, Shift, Shift).
+               This flag automatically activates logging on page load.
+            -->
+            <client-debug-autologging>false</client-debug-autologging>
+        </flags>
+    </config>
+
+    <!--
+        Disable CSRF completely for now
+        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
+        -->
+    <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
+        <filter/>
+    </config>
+
+
+    <!--
+        Change so it is picked up from property where the Alfresco Repo Webapp is running
+        (e.g. http://localhost:8080/alfresco)
+        -->
+    <config evaluator="string-compare" condition="Remote">
+        <remote>
+            <endpoint>
+                <id>alfresco-noauth</id>
+                <name>Alfresco - unauthenticated access</name>
+                <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
+                <connector-id>alfresco</connector-id>
+                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
+                <identity>none</identity>
+            </endpoint>
+
+            <endpoint>
+                <id>alfresco</id>
+                <name>Alfresco - user access</name>
+                <description>Access to Alfresco Repository WebScripts that require user authentication</description>
+                <connector-id>alfresco</connector-id>
+                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
+                <identity>user</identity>
+            </endpoint>
+
+            <endpoint>
+                <id>alfresco-feed</id>
+                <name>Alfresco Feed</name>
+                <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
+                <connector-id>http</connector-id>
+                <endpoint-url>${acs-platform.url}/alfresco/s</endpoint-url>
+                <basic-auth>true</basic-auth>
+                <identity>user</identity>
+            </endpoint>
+
+            <endpoint>
+                <id>alfresco-api</id>
+                <parent-id>alfresco</parent-id>
+                <name>Alfresco Public API - user access</name>
+                <description>Access to Alfresco Repository Public API that require user authentication.
+                    This makes use of the authentication that is provided by parent 'alfresco' endpoint.</description>
+                <connector-id>alfresco</connector-id>
+                <endpoint-url>${acs-platform.url}/alfresco/api</endpoint-url>
+                <identity>user</identity>
+            </endpoint>
+        </remote>
+    </config>
+</alfresco-config>
--- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
+++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
@@ -1,56 +1,56 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Set root logger level to error
-log4j.rootLogger=error, 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=share.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
-
-# Spring
-log4j.logger.org.springframework=warn
-# Turn off Spring remoting warnings that should really be info or debug.
-log4j.logger.org.springframework.remoting.support=error
-log4j.logger.org.springframework.util=error
-
-# MyFaces
-log4j.logger.org.apache.myfaces.util.DebugUtils=info
-log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
-log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
-log4j.logger.org.apache.myfaces.taglib=error
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.web=info
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Freemarker
-# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-#-----------------------------------------------------------------------
-# Custom Share module logging goes here...
-#-----------------------------------------------------------------------
-
-log4j.logger.${package}=debug
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Set root logger level to error
+log4j.rootLogger=error, 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=share.log
+log4j.appender.File.Append=true
+log4j.appender.File.DatePattern='.'yyyy-MM-dd
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
+
+# Spring
+log4j.logger.org.springframework=warn
+# Turn off Spring remoting warnings that should really be info or debug.
+log4j.logger.org.springframework.remoting.support=error
+log4j.logger.org.springframework.util=error
+
+# MyFaces
+log4j.logger.org.apache.myfaces.util.DebugUtils=info
+log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
+log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
+log4j.logger.org.apache.myfaces.taglib=error
+
+# Alfresco
+log4j.logger.org.alfresco=error
+log4j.logger.org.alfresco.config=warn
+log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
+log4j.logger.org.alfresco.web=info
+
+# Web Framework
+log4j.logger.org.springframework.extensions.webscripts=info
+log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=info
+log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+log4j.logger.freemarker.runtime=
+
+#-----------------------------------------------------------------------
+# Custom Share module logging goes here...
+#-----------------------------------------------------------------------
+
+log4j.logger.${package}=debug
--- a/beedk-acs-share-module-tile/pom.xml
+++ b/beedk-acs-share-module-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-share-module-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: ACS Share Module</name>
--- a/beedk-acs-share-rad-tile/.gitignore
+++ b/beedk-acs-share-rad-tile/.gitignore
@@ -0,0 +1,9 @@
+# Eclipse
+.project
+.classpath
+.settings
+
+# Maven
+pom.xml.versionsBackup
+target
+
--- a/beedk-acs-share-rad-tile/README.md
+++ b/beedk-acs-share-rad-tile/README.md
@@ -0,0 +1,82 @@
+# BeeDK Abstract ACS Share Maven Tile for RAD
+
+This is a component within the proposed [BeeDK](/inteligr8/ootbee-beedk).  It is considered to be part of the **Private API** of the BeeDK.
+
+## Purpose
+
+This project creates a [Maven Tile](https://github.com/repaint-io/maven-tiles) that provides the basis for rapid application development of any ACS Share module, extension, service, or web application.  It is intended to be used by other BeeDK components and not directly by any development project.
+
+## Usage
+
+To use this plugin, just reference it with the Maven Tiles plugin as shown in the following snippet.  Do not forget the `extensions` element in the *plugin* configuration.
+
+```xml
+<project ...>
+	...
+	<build>
+		...
+		<plugins>
+			<plugin>
+				<groupId>io.repaint.maven</groupId>
+				<artifactId>tiles-maven-plugin</artifactId>
+				<version>[2.0,3.0)</version>
+				<extensions>true</extensions>
+				<configuration>
+					<tiles>
+						...
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile -->
+						<tile>com.inteligr8.ootbee:beedk-acs-share-rad-tile:[1.0.0,2.0.0)</tile>
+					</tiles>
+				</configuration>
+			</plugin>
+			...
+		</plugins>
+		...
+	</build>
+	...
+</project>
+```
+
+See the [BeeDK documentation](/inteligr8/ootbee-beedk) on instructions for how to start and stop RAD capabilities.
+
+## Configuration
+
+In your Maven project, set the following properties to define the behavior of this Maven Tile.  Unless otherwise stated, they can only be overridden in the project POM or other Maven Tiles loaded earlier than this Maven Tile.
+
+### Public API
+
+The following properties are intended to be exposed by inheriting Public API Maven Tiles.
+
+| Maven Property             | Required | Default         | Description |
+| -------------------------- |:--------:| --------------- | ----------- |
+| `acs-share.hotswap.enabled` |         | true            | Enable the HotSwap Agent for live classpath reloading. |
+| `acs-share.hotswap.disablePlugins` |  |                 | Do not enable the HotSwap Agent with the following plugins.  All plugins are documented here: https://github.com/HotswapProjects/HotswapAgent/tree/master/plugin |
+| `acs-share.debugger.enabled` |        | true            | Enable the JDWP debugger. |
+| `acs-share.port`           |          | 8180            | The port to expose on `localhost` for the developer; not for other applications or users. |
+| `acs-share.debugger.port`  |          | 8100            | The port to expose on `localhost` for the developer; not for other applications or users. |
+| `acs-share.tomcat.opts`    |          |                 | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.* |
+| `acs-share.timeout`        |          | 30000           | The time to wait for the startup to complete, in milliseconds. |
+| `tomcat-rad.version`       |          | *not important* | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
+
+### Private API
+
+The following properties are only intended to be defined by BeeDK components.
+
+| Maven Property                       | Required | Default            | Description |
+| ------------------------------------ |:--------:| ------------------ | ----------- |
+| `beedk.deploy.share.warFile`         | **Yes**  |                    | The WAR file to deploy in the Apache Tomcat instance. |
+| `beedk.deploy.share.classesDirectory` |         |                    | An additional classpath directory to sideload into the web application. |
+| `beedk.deploy.share.testClassesDirectory` |     |                    | An additional test classpath directory to sideload into the web application. |
+| `beedk.deploy.share.extDirectory`    |          |                    | An additional directory of JARs to sideload into the web application. |
+| `beedk.deploy.share.webDirectory`    |          |                    | An additional directory of web resources to sideload in the web application. |
+| `beedk.deploy.share.warDirectory`    |  | `${project.build.warDirectory}` | A build directory for WAR files. |
+
+### Other APIs
+
+Additional less important configurations are inherited from the following Maven Tiles.
+
+*   [`beedk-run-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-run-tile)
+
+## Results
+
+The ACS Share will be started during the `process-classes` Maven phase.
--- a/beedk-acs-share-rad-tile/pom.xml
+++ b/beedk-acs-share-rad-tile/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.inteligr8.ootbee</groupId>
+	<artifactId>beedk-acs-share-rad-tile</artifactId>
+	<version>1.0.11</version>
+	<packaging>tile</packaging>
+
+	<name>Order of the Bee Development Kit: RAD for ACS Share</name>
+	<scm>
+		<url>https://bitbucket.org/inteligr8/ootbee-beedk</url>
+	</scm>
+	<organization>
+		<name>Order of the Bee</name>
+		<url>https://orderofthebee.net</url>
+	</organization>
+	<developers>
+		<developer>
+			<name>Brian Long</name>
+			<email>brian@inteligr8.com</email>
+			<organization>Inteligr8</organization>
+			<organizationUrl>https://www.inteligr8.com</organizationUrl>
+			<url>https://twitter.com/brianmlong</url>
+		</developer>
+	</developers>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>io.repaint.maven</groupId>
+				<artifactId>tiles-maven-plugin</artifactId>
+				<version>2.20</version>
+				<extensions>true</extensions>
+				<configuration>
+					<filtering>true</filtering>
+					<tiles>
+						<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>
+					</tiles>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
--- a/beedk-acs-share-rad-tile/tile.xml
+++ b/beedk-acs-share-rad-tile/tile.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0"
+ 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 		xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://bitbucket.org/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">
+
+	<profiles>
+		<profile>
+			<id>rad-acs-share</id>
+			<activation>
+				<property>
+					<name>rad</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<!-- This plugin downloads the Alfresco SDK configuration for Share -->
+					<plugin>
+						<groupId>com.googlecode.maven-download-plugin</groupId>
+						<artifactId>download-maven-plugin</artifactId>
+						<version>1.6.1</version>
+						<executions>
+							<execution>
+								<id>download-share-config</id>
+								<phase>generate-resources</phase>
+								<goals>
+									<goal>wget</goal>
+								</goals>
+								<configuration>
+									<url>https://raw.githubusercontent.com/Alfresco/alfresco-sdk/alfresco-sdk-aggregator-${alfresco.sdk.version}/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/share-config-custom.xml</url>
+									<outputDirectory>${project.build.directory}/download</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<!-- This plugin configures the Share configuration for the BeeDK -->
+					<plugin>
+						<groupId>com.google.code.maven-replacer-plugin</groupId>
+						<artifactId>maven-replacer-plugin</artifactId>
+						<version>1.4.1</version>
+						<executions>
+							<execution>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>replace</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<basedir>${project.build.directory}/download</basedir>
+							<outputBasedir>${project.build.directory}/runtime-classes</outputBasedir>
+							<file>share-config-custom.xml</file>
+							<outputDir>alfresco/web-extension</outputDir>
+							<replacements>
+								<replacement>
+									<token>http://\$\{acs\.host\}:8080</token>
+									<value>${acs-platform.url}</value>
+								</replacement>
+							</replacements>
+						</configuration>
+					</plugin>
+					<!-- Using Docker to host the web application -->
+					<plugin>
+						<groupId>io.fabric8</groupId>
+						<artifactId>docker-maven-plugin</artifactId>
+						<version>${beedk.plugins.fabric8.docker.version}</version>
+						<executions>
+							<execution>
+								<id>run-acs-share</id>
+								<phase>process-classes</phase>
+								<goals><goal>start</goal></goals>
+								<configuration>
+									<images>
+										<image>
+											<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
+											<alias>acs-share</alias>
+											<run>
+												<env>
+													<ENABLE_JDWP>${acs-share.debugger.enabled}</ENABLE_JDWP>
+													<ENABLE_HOTSWAP>${acs-share.hotswap.enabled}</ENABLE_HOTSWAP>
+													<DISABLE_HOTSWAP_PLUGINS>${acs-share.hotswap.disablePlugins}</DISABLE_HOTSWAP_PLUGINS>
+													<CATALINA_OPTS>${acs-share.tomcat.opts}</CATALINA_OPTS>
+												</env>
+												<ports>
+													<port>${acs-share.port}:8080</port>
+													<port>${acs-share.debugger.port}:8000</port>
+												</ports>
+												<network>
+													<mode>custom</mode>
+													<name>${project.artifactId}</name>
+												</network>
+												<volumes>
+													<bind>
+														<volume>${beedk.deploy.share.warFile}:/var/lib/tomcat/webapps/share.war:ro</volume>
+														<volume>${beedk.deploy.share.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
+														<volume>${beedk.deploy.share.modClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro</volume>
+														<volume>${beedk.deploy.share.extClassesDirectory}:/var/lib/tomcat/dev/classes-extra2:ro</volume>
+														<volume>${beedk.deploy.share.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra3:ro</volume>
+														<volume>${project.build.directory}/runtime-classes:/var/lib/tomcat/dev/classes-extra4:ro</volume>
+														<volume>${beedk.deploy.share.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
+														<volume>${beedk.deploy.share.webDirectory}:/var/lib/tomcat/dev/web:ro</volume>
+													</bind>
+												</volumes>
+												<wait>
+													<http>
+														<url>http://localhost:${acs-share.port}/share</url>
+														<method>GET</method>
+														<status>200..399</status>
+													</http>
+													<time>${acs-share.timeout}</time>
+												</wait>
+											</run>
+										</image>
+									</images>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<!-- allow downstream tiles to default this before this tile does -->
+		<profile>
+			<id>tomcat-opts-unspecified</id>
+			<activation>
+				<property>
+					<name>!acs-share.tomcat.opts</name>
+				</property>
+			</activation>
+			<properties>
+				<acs-share.tomcat.opts></acs-share.tomcat.opts>
+			</properties>
+		</profile>
+		<profile>
+			<id>default-props</id>
+			<activation>
+				<property>
+					<name>!some-prop-that-never-exists</name>
+				</property>
+			</activation>
+			<properties>
+				<!-- configurable -->
+				<beedk.deploy.share.classesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.share.classesDirectory>
+				<beedk.deploy.share.modClassesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.share.modClassesDirectory>
+				<beedk.deploy.share.extClassesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.share.extClassesDirectory>
+				<beedk.deploy.share.testClassesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.share.testClassesDirectory>
+				<beedk.deploy.share.extDirectory>${project.build.directory}/doesnotexist</beedk.deploy.share.extDirectory>
+				<beedk.deploy.share.webDirectory>${project.build.directory}/doesnotexist</beedk.deploy.share.webDirectory>
+				<beedk.deploy.share.warDirectory>${project.build.warDirectory}</beedk.deploy.share.warDirectory>
+				<acs-platform.url>http://${project.artifactId}-acs-platform:8080</acs-platform.url>
+				<acs-share.timeout>150000</acs-share.timeout>
+				<acs-share.debugger.enabled>true</acs-share.debugger.enabled>
+				<acs-share.hotswap.enabled>true</acs-share.hotswap.enabled>
+				<acs-share.hotswap.disablePlugins></acs-share.hotswap.disablePlugins>
+
+				<!-- ports -->
+				<acs-share.port>8180</acs-share.port>
+				<acs-share.debugger.port>8100</acs-share.debugger.port>
+				
+				<!-- versions -->
+				<tomcat-rad.version>9-1.4</tomcat-rad.version>
+
+				<!-- configuring beedk-acs-webapp-artifact-tile -->
+				<alfresco.war.artifactId>share</alfresco.war.artifactId>
+			</properties>
+		</profile>
+	</profiles>
+	
+	<tiles>
+		<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-run-tile -->
+		<tile>@project.groupId@:beedk-run-tile:@project.version@</tile>
+	</tiles>
+
+</project>
--- a/beedk-acs-share-self-it-tile/pom.xml
+++ b/beedk-acs-share-self-it-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-share-self-it-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: Integration Testing for ACS Share</name>
--- a/beedk-acs-share-self-it-tile/tile.xml
+++ b/beedk-acs-share-self-it-tile/tile.xml
@@ -8,7 +8,7 @@
 			<!-- This plugin downloads the Share JAR-based extension modules and runtime/test dependencies -->
 			<plugin>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.2</version>
+				<version>3.2.0</version>
 				<executions>
 					<!-- This execution downloads the dependency JARs, including JAR modules -->
 					<execution>
@@ -85,6 +85,10 @@
 									<alias>acs-share</alias>
 									<run>
 										<skip>${skipTests}</skip>
+										<env>
+											<ENABLE_JDWP>false</ENABLE_JDWP>
+											<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
+										</env>
 										<ports>
 											<port>${acs-share.port}:8080</port>
 										</ports>
@@ -148,7 +152,7 @@
 				<acs-share.port>8180</acs-share.port>

 				<!-- versions -->
-				<tomcat-rad.version>9-1.3</tomcat-rad.version>
+				<tomcat-rad.version>9-1.4</tomcat-rad.version>
 				
 				<!-- configuring beedk-acs-webapp-artifact-tile -->
 				<alfresco.war.artifactId>share</alfresco.war.artifactId>
--- a/beedk-acs-share-self-rad-tile/README.md
+++ b/beedk-acs-share-self-rad-tile/README.md
@@ -37,6 +37,19 @@ To use this plugin, just reference it with the Maven Tiles plugin as shown in th
 </project>
 ```

+There are 2 other alternative tiles that serve a similar purpose, but are for other use cases.  Make sure you are using the right one.  Follow the logic below.
+
+Is your Maven project an ACS Share module or ACS Share web application?
+: You will be declaring the `beedk-acs-share-module-tile` or `beedk-acs-share-webapp-tile` Maven Tile.  You will need to explicitly declare and configure the `beedk-acs-share-self-rad-tile` Maven Tile.
+
+Is your Maven project just one within a set of other Maven projects AND one of those other Maven projects is an ACS Share web application (not a module)?
+: You will need to explicitly declare and configure the [`beedk-acs-share-sibling-rad-tile` Maven Tile](../beedk-acs-share-sibling-rad-tile).
+
+Otherwise
+: You will need to explicitly declare and configure the [`beedk-acs-share-artifact-rad-tile` Maven Tile](../beedk-acs-share-artifact-rad-tile).
+
+See the [BeeDK documentation](/inteligr8/ootbee-beedk) on instructions for how to start and stop RAD capabilities.
+
 ## Configuration

 In your Maven project, set the following properties to define the behavior of this Maven Tile.  Unless otherwise stated, they can only be overridden in the project POM or other Maven Tiles loaded earlier than this Maven Tile.
@@ -51,12 +64,10 @@ The following properties are intended to be exposed by inheriting Public API Mav
 | `alfresco.share.version`           | *Maybe*  |                    | The Alfresco Share version to use for RAD.  See below for more details. |
 | `alfresco.war.artifactId`          |          | `share`            | The Maven `artifactId` of a Maven `war` Type Project defined in a Maven Repository.<br/>*Inherited from [`beedk-acs-webapp-artifact-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-tile)* |
 | `alfresco.war.version`             | *Maybe*  | *See Below*        | The Maven `version` of a Maven `war` Type Project defined in a Maven Repository.<br/>*Inherited from [`beedk-acs-webapp-artifact-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-tile)* |
-| `project.build.shareExtDirectory`  |  | `${project.build.directory}/ext/share` | An additional directory of JARs to add to the ACS Share at runtime. |
 | `acs-platform.url`                 |          | *See Below*        | The URL of the backend ACS Platform to be used. |
 | `acs-share.port`                   |          | 8180               | The port to expose on `localhost` for the developer; not for other applications or users. |
 | `acs-share.debugger.port`          |          | 8100               | The port to expose on `localhost` for the developer; not for other applications or users. |
-| `acs-share.timeout`                |          | 45000              | The time to wait for the startup to complete, in milliseconds. |
-| `tomcat-rad.version`               |          | *not important*    | The version of the [Apache Tomcat Rapid Application Development Docker container](/inteligr8/tomcat-rad-docker). |
+| `acs-share.tomcat.opts`         |          |                    | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.*<br/>*Inherited from [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)* |

 *   The `alfresco.share.version` is used to default the `alfresco.war.version`.  It is expected to be used by other Maven Tiles, so it is here for convenience.  You must specify either property for this tile to function.
 *   The `acs-platform.url` will default to the appropriate value when using the `beedk-acs-platform-*-rad-tile` tiles.  This should be overridden if you are not using those tiles and are instead using some other ACS Platform instance.
@@ -65,7 +76,7 @@ The following properties are intended to be exposed by inheriting Public API Mav

 Additional less important configurations are inherited from the following Maven Tiles.

-*   [`beedk-run-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-run-tile)
+*   [`beedk-acs-share-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-share-rad-tile)
 *   [`beedk-acs-webapp-artifact-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-rad-tile)

 ## Results
--- a/beedk-acs-share-self-rad-tile/pom.xml
+++ b/beedk-acs-share-self-rad-tile/pom.xml
@@ -7,7 +7,7 @@

 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-acs-share-self-rad-tile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.11</version>
 	<packaging>tile</packaging>

 	<name>Order of the Bee Development Kit: RAD for ACS Share</name>
--- a/beedk-acs-share-self-rad-tile/tile.xml
+++ b/beedk-acs-share-self-rad-tile/tile.xml
@@ -13,10 +13,10 @@
 			</activation>
 			<build>
 				<plugins>
-					<!-- This plugin downloads the Share JAR-based extension modules and runtime/test dependencies -->
+					<!-- This plugin downloads the Share JAR-based extension modules -->
 					<plugin>
 						<artifactId>maven-dependency-plugin</artifactId>
-						<version>3.1.2</version>
+						<version>3.2.0</version>
 						<executions>
 							<!-- This execution downloads the dependency JARs, including JAR modules -->
 							<execution>
@@ -26,103 +26,7 @@
 								<configuration>
 									<excludeScope>provided</excludeScope>
 									<includeTypes>jar</includeTypes>
-									<outputDirectory>${project.build.shareExtDirectory}</outputDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<!-- This plugin downloads the Alfresco SDK configuration for Share -->
-					<plugin>
-						<groupId>com.googlecode.maven-download-plugin</groupId>
-						<artifactId>download-maven-plugin</artifactId>
-						<version>1.6.1</version>
-						<executions>
-							<execution>
-								<id>download-share-config</id>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>wget</goal>
-								</goals>
-								<configuration>
-									<url>https://raw.githubusercontent.com/Alfresco/alfresco-sdk/alfresco-sdk-aggregator-${alfresco.sdk.version}/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/share-config-custom.xml</url>
-									<outputDirectory>${project.build.directory}/download</outputDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<!-- This plugin configures the Share configuration for the BeeDK -->
-					<plugin>
-						<groupId>com.google.code.maven-replacer-plugin</groupId>
-						<artifactId>maven-replacer-plugin</artifactId>
-						<version>1.4.1</version>
-						<executions>
-							<execution>
-								<phase>process-resources</phase>
-								<goals>
-									<goal>replace</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<basedir>${basedir}/target/download</basedir>
-							<outputBasedir>${basedir}/target/test-classes</outputBasedir>
-							<file>share-config-custom.xml</file>
-							<outputDir>alfresco/web-extension</outputDir>
-							<replacements>
-								<replacement>
-									<token>http://\$\{acs\.host\}:8080</token>
-									<value>${acs-platform.url}</value>
-								</replacement>
-							</replacements>
-						</configuration>
-					</plugin>
-					<!-- Using Docker to host the web application -->
-					<plugin>
-						<groupId>io.fabric8</groupId>
-						<artifactId>docker-maven-plugin</artifactId>
-						<version>${beedk.plugins.fabric8.docker.version}</version>
-						<executions>
-							<execution>
-								<id>run-acs-share</id>
-								<phase>process-classes</phase>
-								<goals><goal>start</goal></goals>
-								<configuration>
-									<tiles-keep-id>true</tiles-keep-id>
-									<images>
-										<image>
-											<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
-											<alias>acs-share</alias>
-											<run>
-												<ports>
-													<port>${acs-share.port}:8080</port>
-													<port>${acs-share.debugger.port}:8000</port>
-												</ports>
-												<network>
-													<mode>custom</mode>
-													<name>${project.artifactId}</name>
-												</network>
-												<volumes>
-													<bind>
-														<volume>${project.build.warFile}:/var/lib/tomcat/webapps/share.war:ro</volume>
-														<volume>${project.build.outputDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
-														<volume>${project.build.directory}/module-classes:/var/lib/tomcat/dev/classes-extra1:ro</volume>
-														<volume>${project.build.directory}/extension-classes:/var/lib/tomcat/dev/classes-extra2:ro</volume>
-														<volume>${project.build.testOutputDirectory}:/var/lib/tomcat/dev/classes-extra3:ro</volume>
-														<volume>${project.build.shareExtDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
-														<volume>${project.build.directory}/web-resources:/var/lib/tomcat/dev/web:ro</volume>
-													</bind>
-												</volumes>
-												<wait>
-													<http>
-														<url>http://localhost:${acs-share.port}/share</url>
-														<method>GET</method>
-														<status>200..399</status>
-													</http>
-													<time>${acs-share.timeout}</time>
-												</wait>
-											</run>
-										</image>
-									</images>
+									<outputDirectory>${beedk.deploy.share.extDirectory}</outputDirectory>
 								</configuration>
 							</execution>
 						</executions>
@@ -139,19 +43,16 @@
 			</activation>
 			<properties>
 				<!-- configurable -->
-				<acs-platform.url>http://${project.artifactId}-acs-platform:8080</acs-platform.url>
-				<acs-share.debugger.port>8100</acs-share.debugger.port>
-				<acs-share.timeout>45000</acs-share.timeout>
-				<project.build.shareExtDirectory>${project.build.directory}/ext/share</project.build.shareExtDirectory>
-				
-				<!-- ports -->
-				<acs-share.port>8180</acs-share.port>
-
-				<!-- versions -->
-				<tomcat-rad.version>9-1.3</tomcat-rad.version>
+				<beedk.deploy.share.warFile>${project.build.warFile}</beedk.deploy.share.warFile>
+				<beedk.deploy.share.classesDirectory>${project.build.outputDirectory}</beedk.deploy.share.classesDirectory>
+				<beedk.deploy.share.modClassesDirectory>${project.build.directory}/module-classes</beedk.deploy.share.modClassesDirectory>
+				<beedk.deploy.share.extClassesDirectory>${project.build.directory}/extension-classes</beedk.deploy.share.extClassesDirectory>
+				<beedk.deploy.share.testClassesDirectory>${project.build.testOutputDirectory}</beedk.deploy.share.testClassesDirectory>
+				<beedk.deploy.share.extDirectory>${project.build.directory}/ext/share</beedk.deploy.share.extDirectory>
+				<beedk.deploy.share.warDirectory>${project.build.directory}/war</beedk.deploy.share.warDirectory>
+				<beedk.deploy.share.webDirectory>${project.build.directory}/web-resources</beedk.deploy.share.webDirectory>
 				
 				<!-- configuring beedk-acs-webapp-artifact-tile -->
-				<alfresco.war.artifactId>share</alfresco.war.artifactId>
 				<alfresco.war.version>${alfresco.share.version}</alfresco.war.version>
 			</properties>
 		</profile>
@@ -159,7 +60,7 @@
 	
 	<tiles>
 		<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-run-tile -->
-		<tile>@project.groupId@:beedk-run-tile:@project.version@</tile>
+		<tile>@project.groupId@:beedk-acs-share-rad-tile:@project.version@</tile>
 		<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-rad-tile -->
 		<tile>@project.groupId@:beedk-acs-webapp-artifact-rad-tile:@project.version@</tile>
 	</tiles>
--- a/beedk-acs-share-webapp-docker-tile/.gitignore
+++ b/beedk-acs-share-webapp-docker-tile/.gitignore
@@ -0,0 +1,9 @@
+# Eclipse
+.project
+.classpath
+.settings
+
+# Maven
+pom.xml.versionsBackup
+target
+
--- a/beedk-acs-share-webapp-docker-tile/Dockerfile
+++ b/beedk-acs-share-webapp-docker-tile/Dockerfile
@@ -0,0 +1,17 @@
+FROM alfresco/alfresco-share:${alfresco.share.version}
+
+ARG USERNAME=alfresco
+ARG TOMCAT_DIR=/usr/local/tomcat
+
+USER root
+
+COPY catalina.policy /tmp/catalina.policy.ext
+COPY tomcat-share-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/share.xml
+
+RUN mkdir -p ${TOMCAT_DIR}/modules/share && \
+        cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
+
+COPY war/${alfresco.war.artifactId}-${alfresco.war.version}.war ${TOMCAT_DIR}/webapps/share.war
+COPY ext/share/*.jar ${TOMCAT_DIR}/modules/share/
+
+USER ${USERNAME}
--- a/beedk-acs-share-webapp-docker-tile/README.md
+++ b/beedk-acs-share-webapp-docker-tile/README.md
--- a/beedk-acs-share-webapp-docker-tile/catalina.policy
+++ b/beedk-acs-share-webapp-docker-tile/catalina.policy
@@ -0,0 +1,4 @@
+grant codeBase "file:${catalina.base}/modules/-" {
+    permission java.security.AllPermission;
+};
+
--- a/beedk-acs-share-webapp-docker-tile/pom.xml
+++ b/beedk-acs-share-webapp-docker-tile/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.inteligr8.ootbee</groupId>
+	<artifactId>beedk-acs-share-webapp-docker-tile</artifactId>
+	<version>1.0.11</version>
+	<packaging>tile</packaging>
+
+	<name>Order of the Bee Development Kit: ACS Share Web Application Docker Enablement</name>
+	<scm>
+		<url>https://bitbucket.org/inteligr8/ootbee-beedk</url>
+	</scm>
+	<organization>
+		<name>Order of the Bee</name>
+		<url>https://orderofthebee.net</url>
+	</organization>
+	<developers>
+		<developer>
+			<name>Brian Long</name>
+			<email>brian@inteligr8.com</email>
+			<organization>Inteligr8</organization>
+			<organizationUrl>https://www.inteligr8.com</organizationUrl>
+			<url>https://twitter.com/brianmlong</url>
+		</developer>
+	</developers>
+	
+    <build>
+		<plugins>
+			<plugin>
+				<groupId>io.repaint.maven</groupId>
+				<artifactId>tiles-maven-plugin</artifactId>
+				<version>2.20</version>
+				<extensions>true</extensions>
+				<configuration>
+					<filtering>true</filtering>
+					<tiles>
+						<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>
+					</tiles>
+				</configuration>
+			</plugin>
+		</plugins>
+    </build>
+
+</project>
--- a/beedk-acs-share-webapp-docker-tile/tile.xml
+++ b/beedk-acs-share-webapp-docker-tile/tile.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://bitbucket.org/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">
+
+	<profiles>
+		<profile>
+			<id>scaffold-acs-share-webapp-docker</id>
+			<activation>
+				<property>
+					<name>scaffold</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<!-- This plugin downloads the required configurations for all modules -->
+					<plugin>
+						<groupId>com.googlecode.maven-download-plugin</groupId>
+						<artifactId>download-maven-plugin</artifactId>
+						<version>1.6.1</version>
+						<executions>
+                            <!-- TODO eventually replace these with the archetype versions -->
+							<execution>
+								<id>download-dockerfile</id>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>wget</goal>
+								</goals>
+								<configuration>
+									<url>https://bitbucket.org/inteligr8/ootbee-beedk/raw/stable/beedk-acs-share-webapp-docker-tile/Dockerfile</url>
+									<outputDirectory>${basedir}/src/main/docker</outputDirectory>
+								</configuration>
+							</execution>
+							<execution>
+								<id>download-policy</id>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>wget</goal>
+								</goals>
+								<configuration>
+									<url>https://bitbucket.org/inteligr8/ootbee-beedk/raw/stable/beedk-acs-share-webapp-docker-tile/catalina.policy</url>
+									<outputDirectory>${basedir}/src/main/docker</outputDirectory>
+								</configuration>
+							</execution>
+							<execution>
+								<id>download-context</id>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>wget</goal>
+								</goals>
+								<configuration>
+									<url>https://bitbucket.org/inteligr8/ootbee-beedk/raw/stable/beedk-acs-share-webapp-docker-tile/tomcat-share-context.xml</url>
+									<outputDirectory>${basedir}/src/main/docker</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+	<tiles>
+		<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-docker-tile -->
+		<tile>@project.groupId@:beedk-acs-webapp-docker-tile:@project.version@</tile>
+	</tiles>
+
+</project>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brian M. Long	6d70c711c1	Merge branch 'develop' into stable	2021-10-29 10:02:51 -04:00
Brian M. Long	bdd1693cab	amp-plugin to v1.0.6 [fix dependency inclusion]	2021-10-29 10:02:27 -04:00
Brian M. Long	d4f8e78425	Merge branch 'develop' into stable	2021-10-28 17:24:54 -04:00
Brian M. Long	012bb361ba	maven-dependency-plugin to v3.2.0	2021-10-28 17:24:36 -04:00
Brian M. Long	b2104c796a	Merge branch 'develop' into stable	2021-10-28 16:59:16 -04:00
Brian M. Long	a49c5a7dbb	only download WAR when using RAD or IT	2021-10-28 16:59:07 -04:00
Brian M. Long	0745cc91a7	v1.0.11 poms	2021-10-28 16:40:48 -04:00
Brian M. Long	fb843bac2c	Merge branch 'develop' into stable	2021-10-28 16:39:30 -04:00
Brian M. Long	9fe73068e8	only build WAR for RAD when using RAD	2021-10-28 16:39:11 -04:00
Brian M. Long	fb95cc1464	fixed ACS platform IT timing	2021-10-28 16:38:53 -04:00
Brian Long	ad177123ff	Merge branch 'develop' into stable	2021-06-28 23:55:46 -04:00
Brian Long	05bf7c29e6	moved share-config-custom to common RAD	2021-06-28 23:55:19 -04:00
Brian Long	920d858886	v1.0.10 poms	2021-06-28 21:30:54 -04:00
Brian Long	be462b6dd1	Merge branch 'develop' into stable	2021-06-28 21:27:05 -04:00
Brian Long	585b2cf745	refactored acs-share RAD	2021-06-28 21:26:48 -04:00
Brian Long	c6df90008f	added configurable hotswap plugins	2021-06-02 23:12:32 -04:00
Brian Long	827e693e60	added license loading	2021-06-02 09:34:02 -04:00
Brian Long	42d3c38e9f	v1.0.9 poms	2021-06-02 09:06:54 -04:00
Brian Long	5dd6dffb62	Merge branch 'develop' into stable	2021-06-02 09:06:21 -04:00
Brian Long	46ba0521f3	added conditional AMP check	2021-06-02 09:05:53 -04:00
Brian Long	17a18d6551	using amp-plugin v1.0.5 to fix dependency exclude	2021-06-02 08:23:28 -04:00
Brian Long	4df9fcbe11	v1.0.8 poms	2021-06-01 17:08:36 -04:00
Brian Long	be5c04785b	Merge branch 'develop' into stable	2021-06-01 17:07:39 -04:00
Brian Long	1ff5ab460e	added beedk-aps-rad-tile	2021-06-01 17:07:23 -04:00
Brian Long	3777dad5c8	updated RAD docker image/config	2021-06-01 13:26:23 -04:00
Brian Long	e362b71115	v1.0.7 poms	2021-05-19 16:17:23 -04:00
Brian Long	7c833c2093	Merge branch 'develop' into stable	2021-05-19 16:16:57 -04:00
Brian Long	a889607c48	fixed amp/jar deploy selection	2021-05-19 16:16:45 -04:00
Brian Long	1a7c70792c	v1.0.6 poms	2021-05-19 11:20:30 -04:00
Brian Long	3828e24d8b	Merge branch 'develop' into stable	2021-05-19 11:18:01 -04:00
Brian Long	e4611ffd07	updated amp-plugin version	2021-05-19 11:17:43 -04:00
Brian Long	474b5e5909	v1.0.5 poms	2021-05-18 12:39:58 -04:00
Brian Long	dea15ab95d	Merge branch 'develop' into stable	2021-05-18 12:38:01 -04:00
Brian Long	d13678e9e0	fixed install/deploy enable/disable for AMPs	2021-05-18 12:37:50 -04:00
Brian Long	155ef084e9	v1.0.4 poms	2021-05-17 22:07:53 -04:00
Brian Long	0adf7812b4	Merge branch 'develop' into stable	2021-05-17 22:07:14 -04:00
Brian Long	c135bc7274	fixed aps-ext version	2021-05-17 22:07:00 -04:00
Brian Long	ac67f46408	fixed install/deploy for AMPs	2021-05-17 22:06:39 -04:00
Brian Long	875a580854	v1.0.3 poms	2021-05-17 17:58:11 -04:00
Brian Long	5474eef9f5	Merge branch 'develop' into stable	2021-05-17 17:57:37 -04:00
Brian Long	61b7e6d728	fixed AMP packaging with newer version of plugin	2021-05-17 17:57:21 -04:00
Brian Long	ad92fb5a21	added beedk-aps-ext-rad-tile	2021-05-14 15:31:32 -04:00
Brian Long	a68baeae70	v1.0.2 poms	2021-05-12 15:03:44 -04:00
Brian Long	417c419900	Merge branch 'develop' into stable	2021-05-12 14:59:15 -04:00
Brian Long	d80c6b9400	fixed activiti archetype	2021-05-12 14:59:04 -04:00
Brian Long	df89b65373	fixed ACS module build to include classes	2021-05-12 14:58:33 -04:00
Brian Long	45b72fd703	disabling embedded activiti for RAD/IT tests	2021-05-12 14:58:16 -04:00
Brian Long	33b38f47cc	fixed/refactored ACS archetypes	2021-05-12 14:57:17 -04:00
Brian Long	9815726895	added beedk-activiti-ext-archetype	2021-05-10 15:24:02 -04:00
Brian Long	669f1e6970	v1.0.1 poms	2021-04-28 11:14:34 -04:00
Brian Long	af196113e2	Merge branch 'develop' into stable	2021-04-28 11:11:16 -04:00
Brian Long	52d8f70130	fixed ACS docker builds	2021-04-28 11:10:14 -04:00
Brian Long	da7d9e3c5e	added ACS docker tiles	2021-04-28 10:22:58 -04:00
Brian Long	8d2be7ad2b	Merge branch 'develop' into stable	2021-04-22 17:06:45 -04:00
Brian Long	a7d1509c24	updated documentation	2021-04-22 17:06:29 -04:00
Brian Long	27861a933d	updated parent project name	2021-04-22 16:40:15 -04:00
Brian Long	7a6267132e	disabling deploy for parent	2021-04-22 16:38:53 -04:00
Brian Long	3756c96cff	added update version scripts	2021-04-22 16:28:56 -04:00