update archetypes

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.ps1

@@ -5,27 +5,27 @@ function discoverArtifactId {
 
 function rebuild {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 function start_ {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 function start_log {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad "-Ddocker.showLogs" process-classes
+	mvn -Drad "-Ddocker.showLogs" process-test-classes
 }
 
 function stop_ {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 	echo "Stopping containers ..."
-	docker container stop (docker container ls -q --filter name=${ARTIFACT_ID}-*)
+	docker container stop (docker container ls -q --filter name="^/${ARTIFACT_ID}")
 	echo "Removing containers ..."
-	docker container rm (docker container ls -aq --filter name=${ARTIFACT_ID}-*)
+	docker container rm (docker container ls -aq --filter name="^/${ARTIFACT_ID}")
 }
 
 function tail_logs {
@@ -34,12 +34,12 @@ function tail_logs {
 	)
 	
 	discoverArtifactId
-	docker container logs -f (docker container ls -q --filter name=${ARTIFACT_ID}-${container})
+	docker container logs -f (docker container ls -q --filter name="^/${ARTIFACT_ID}-${container}$")
 }
 
 function list {
 	discoverArtifactId
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 }
 
 switch ($args[0]) {

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.sh

@@ -1,42 +1,42 @@
 #!/bin/sh
 
 discoverArtifactId() {
-	ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
+	local ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
 }
 
 rebuild() {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 start() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 start_log() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad -Ddocker.showLogs process-classes
+	mvn -Drad -Ddocker.showLogs process-test-classes
 }
 
 stop() {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 	echo "Stopping containers ..."
-	docker container stop `docker container ls -q --filter name=${ARTIFACT_ID}-*`
+	docker container stop `docker container ls -q --filter name="^/${ARTIFACT_ID}"`
 	echo "Removing containers ..."
-	docker container rm `docker container ls -aq --filter name=${ARTIFACT_ID}-*`
+	docker container rm `docker container ls -aq --filter name="^/${ARTIFACT_ID}"`
 }
 
 tail_logs() {
 	discoverArtifactId
-	docker container logs -f `docker container ls -q --filter name=${ARTIFACT_ID}-$1`
+	docker container logs -f `docker container ls -q --filter name="^/${ARTIFACT_ID}-$1$"`
 }
 
 list() {
 	discoverArtifactId
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 }
 
 case "$1" in

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/ExampleBootstrap.java

@@ -20,16 +20,17 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
 import org.alfresco.service.ServiceRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 import org.springframework.stereotype.Component;
 
 /**
  * This class is an example of how you can use the Alfresco Java Public API on startup or shutdown.
  */
 @Component
-public class ExampleBootstrap implements InitializingBean, DisposableBean {
+public class ExampleBootstrap extends AbstractLifecycleBean {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 	
@@ -37,10 +38,29 @@ public class ExampleBootstrap implements InitializingBean, DisposableBean {
     @Autowired
     protected ServiceRegistry serviceRegistry;
     
+    @Value("${example.config.value:default}")
+    private String configValue;
+    
+    @Value("${example.config.value:#{null}}")
+    private String configValueWithNullDefault;
+    
+    /**
+     * This is called after Spring beans and configuration are injected, but
+     * before ACS services are ready.  So don't call any ACS services, start an
+     * ACS transaction, or try to create an authentication context.
+     */
+    @PostConstruct
+    private void init() {
+    }
+    
+    /**
+     * This is called after @PostConstruct and all the ACS services are
+     * initialized and ready.  You will have no authentication or transaction
+     * context.
+     */
     @Override
-	public void afterPropertiesSet() throws Exception {
-		if (this.logger.isTraceEnabled())
-			this.logger.trace("onStartup()");
+    protected void onBootstrap(ApplicationEvent event) {
+    	this.logger.trace("onBootstrap()");
 		
 		// provide some authority within the Alfresco context
 		AuthenticationUtil.runAsSystem(new RunAsWork<Void>() {
@@ -58,9 +78,13 @@ public class ExampleBootstrap implements InitializingBean, DisposableBean {
 		});
 	}
 
+    /**
+     * This is called after @PostConstruct and all the ACS services are
+     * initialized and ready.  You will have no authentication or transaction
+     * context.
+     */
     @Override
-	public void destroy() throws Exception {
-		if (this.logger.isTraceEnabled())
+    protected void onShutdown(ApplicationEvent event) {
     	this.logger.trace("onShutdown()");
 		
 		// provide some authority within the Alfresco context

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/ExampleEventListener.java

@@ -21,15 +21,15 @@ import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 import org.springframework.stereotype.Component;
 
 /**
  * This class is an example of how you can use the Alfresco Java Public API when Alfresco triggers an event.
  */
 @Component
-public class ExampleEventListener implements InitializingBean, OnCreateNodePolicy {
+public class ExampleEventListener extends AbstractLifecycleBean implements OnCreateNodePolicy {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 	
@@ -38,12 +38,16 @@ public class ExampleEventListener implements InitializingBean, OnCreateNodePolic
     protected ServiceRegistry serviceRegistry;
 	
     @Override
-	public void afterPropertiesSet() throws Exception {
+    protected void onBootstrap(ApplicationEvent event) {
 		this.bind();
 	}
 
+	/**
+	 * This must be called after the `PolicyComponent` is initialized/ready.
+	 * So you cannot call it from with `@PostConstruct` or using
+	 * `InitializingBean`.
+	 */
 	public void bind() {
-		if (this.logger.isTraceEnabled())
 		this.logger.trace("bind()");
 
 		// example listener
@@ -51,9 +55,15 @@ public class ExampleEventListener implements InitializingBean, OnCreateNodePolic
 				new JavaBehaviour(this, OnCreateNodePolicy.QNAME.getLocalName(), NotificationFrequency.TRANSACTION_COMMIT));
 	}
 	
+	/**
+	 * This will execute with the same authentication and transaction context
+	 * as was used to create the node, unless the binding is
+	 * `TRANSACTION_COMMIT`.  Then it will only have the same transaction
+	 * context and the authentication context used when starting the
+	 * transaction.
+	 */
 	@Override
 	public void onCreateNode(ChildAssociationRef childAssocRef) {
-		if (this.logger.isTraceEnabled())
 		this.logger.trace("onCreateNode('" + childAssocRef.getChildRef() + "')");
 		
 		// TODO do some work

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/ExampleGetWebScript.java

@@ -39,6 +39,11 @@ public class ExampleGetWebScript extends AbstractWebScript {
     @Autowired
     protected ServiceRegistry serviceRegistry;
 
+    /**
+     * This will have the authentication context of the authenticated user
+     * calling the REST endpoint.  The transaction context is defined in the
+     * web script descriptor.
+     */
     @Override
     public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException {
 		if (this.logger.isTraceEnabled())

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/ExampleJavaScriptRootObject.java

@@ -32,11 +32,17 @@ public class ExampleJavaScriptRootObject extends BaseProcessorExtension {
     @Autowired
     protected ServiceRegistry serviceRegistry;
     
+    /**
+     * An example method that called from within a JavaScript within the ACS
+     * application: `example.getMessage("example.property")`.  All simple
+     * parameter and return types are generally supported.
+     * 
+     * The `example` root name comes from the `module-context.xml` file.
+     */
     public String getMessage(String messageKey) {
     	if (this.logger.isTraceEnabled())
     		this.logger.trace("getMessage('" + messageKey + "')");
     	
-    	// just and example method, called in JS with: example.getMessage("example.property");
     	return this.serviceRegistry.getDictionaryService().getMessage(messageKey);
     }
 

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,10 @@
 <!-- Documentation: https://docs.alfresco.com/content-services/6.2/develop/reference/web-scripts-ref -->
-<webscript>
+<webscript xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="https://bitbucket.org/!api/2.0/snippets/inteligr8/AzMgbp/HEAD/files/snippet.txt">
 	<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>
+	<url>/exampleJava?paramName={paramValue}</url>
+	<format default="json"></format>
+	<authentication>user</authentication>
 </webscript>

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,10 @@
 <!-- Documentation: https://docs.alfresco.com/content-services/6.2/develop/reference/web-scripts-ref -->
-<webscript>
+<webscript xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="https://bitbucket.org/!api/2.0/snippets/inteligr8/AzMgbp/HEAD/files/snippet.txt">
 	<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>
+	<url>/exampleJs?paramName={paramValue}</url>
+	<format default="json"></format>
+	<authentication>guest</authentication>
 </webscript>

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/log4j2.properties

@@ -0,0 +1,2 @@
+logger.example.name=${package}
+logger.example.level=info

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/test/resources/alfresco/extension/debug-log4j2.properties

@@ -0,0 +1,8 @@
+# Module debugging
+logger.example.level=trace
+
+# WebScript debugging
+logger.springframework-extensions-webscripts-ScriptLogger.level=debug
+
+# non-WebScript JavaScript execution debugging
+logger.alfresco-repo-jscript-ScriptLogger.level=debug

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.ps1

@@ -5,27 +5,27 @@ function discoverArtifactId {
 
 function rebuild {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 function start_ {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 function start_log {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad "-Ddocker.showLogs" process-classes
+	mvn -Drad "-Ddocker.showLogs" process-test-classes
 }
 
 function stop_ {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 	echo "Stopping containers ..."
-	docker container stop (docker container ls -q --filter name=${ARTIFACT_ID}-*)
+	docker container stop (docker container ls -q --filter name="^/${ARTIFACT_ID}")
 	echo "Removing containers ..."
-	docker container rm (docker container ls -aq --filter name=${ARTIFACT_ID}-*)
+	docker container rm (docker container ls -aq --filter name="^/${ARTIFACT_ID}")
 }
 
 function tail_logs {
@@ -34,12 +34,12 @@ function tail_logs {
 	)
 	
 	discoverArtifactId
-	docker container logs -f (docker container ls -q --filter name=${ARTIFACT_ID}-${container})
+	docker container logs -f (docker container ls -q --filter name="^/${ARTIFACT_ID}-${container}$")
 }
 
 function list {
 	discoverArtifactId
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 }
 
 switch ($args[0]) {

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.sh

@@ -1,42 +1,42 @@
 #!/bin/sh
 
 discoverArtifactId() {
-	ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
+	local ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
 }
 
 rebuild() {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 start() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 start_log() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad -Ddocker.showLogs process-classes
+	mvn -Drad -Ddocker.showLogs process-test-classes
 }
 
 stop() {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 	echo "Stopping containers ..."
-	docker container stop `docker container ls -q --filter name=${ARTIFACT_ID}-*`
+	docker container stop `docker container ls -q --filter name="^/${ARTIFACT_ID}"`
 	echo "Removing containers ..."
-	docker container rm `docker container ls -aq --filter name=${ARTIFACT_ID}-*`
+	docker container rm `docker container ls -aq --filter name="^/${ARTIFACT_ID}"`
 }
 
 tail_logs() {
 	discoverArtifactId
-	docker container logs -f `docker container ls -q --filter name=${ARTIFACT_ID}-$1`
+	docker container logs -f `docker container ls -q --filter name="^/${ARTIFACT_ID}-$1$"`
 }
 
 list() {
 	discoverArtifactId
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 }
 
 case "$1" in

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/log4j2.properties

@@ -0,0 +1,2 @@
+logger.example.name=${package}
+logger.example.level=info

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/log4j2.properties

@@ -0,0 +1,74 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Set root logger level to error
+rootLogger.level=error
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+# All outputs currently set to be a ConsoleAppender.
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
+
+###### File appender definition #######
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=share.log
+appender.rolling.filePattern=share.log.%d{yyyy-MM-dd}
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type=TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval=1
+
+# Spring
+logger.springframework.name=org.springframework
+logger.springframework.level=warn
+
+# Turn off Spring remoting warnings that should really be info or debug.
+logger.springframework-remoting-support.name=org.springframework.remoting.support
+logger.springframework-remoting-support.level=error
+logger.springframework-util.name=org.springframework.util
+logger.springframework-util.level=error
+
+# MyFaces
+logger.apache-myfaces-util-DebugUtils.name=org.apache.myfaces.util.DebugUtils
+logger.apache-myfaces-util-DebugUtils.level=info
+logger.apache-myfaces-el-VariableResolverImpl.name=org.apache.myfaces.el.VariableResolverImpl
+logger.apache-myfaces-el-VariableResolverImpl.level=error
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.name=org.apache.myfaces.application.jsp.JspViewHandlerImpl
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.level=error
+logger.apache-myfaces-taglib.name=org.apache.myfaces.taglib
+logger.apache-myfaces-taglib.level=error
+
+# Alfresco
+logger.alfresco.name=org.alfresco
+logger.alfresco.level=error
+logger.alfresco-config.name=org.alfresco.config
+logger.alfresco-config.level=warn
+logger.alfresco-config-JndiObjectFactoryBean.name=org.alfresco.config.JndiObjectFactoryBean
+logger.alfresco-config-JndiObjectFactoryBean.level=warn
+logger.alfresco-web.name=org.alfresco.web
+logger.alfresco-web.level=info
+
+# Web Framework
+logger.springframework-extensions-webscripts.name=org.springframework.extensions.webscripts
+logger.springframework-extensions-webscripts.level=info
+logger.springframework-extensions-webscripts-ScriptLogger.name=org.springframework.extensions.webscripts.ScriptLogger
+logger.springframework-extensions-webscripts-ScriptLogger.level=warn
+logger.springframework-extensions-webscripts-ScriptDebugger.name=org.springframework.extensions.webscripts.ScriptDebugger
+logger.springframework-extensions-webscripts-ScriptDebugger.level=off
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+logger.freemarker-runtime.name=freemarker.runtime
+logger.freemarker-runtime.level=
+
+#-----------------------------------------------------------------------
+# Custom Share module logging goes here...
+#-----------------------------------------------------------------------
+
+logger.example.name=${package}
+logger.example.level=debug

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/tengine-A/rad.ps1

@@ -5,12 +5,12 @@ function discoverArtifactId {
 
 function rebuild {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 function start_ {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 function stop_ {

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/tengine-A/rad.sh

@@ -6,12 +6,12 @@ discoverArtifactId() {
 
 rebuild() {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 start() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 stop() {

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.ps1

@@ -5,27 +5,27 @@ function discoverArtifactId {
 
 function rebuild {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 function start_ {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 function start_log {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad "-Ddocker.showLogs" process-classes
+	mvn -Drad "-Ddocker.showLogs" process-test-classes
 }
 
 function stop_ {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 	echo "Stopping containers ..."
-	docker container stop (docker container ls -q --filter name=${ARTIFACT_ID}-*)
+	docker container stop (docker container ls -q --filter name="^/${ARTIFACT_ID}")
 	echo "Removing containers ..."
-	docker container rm (docker container ls -aq --filter name=${ARTIFACT_ID}-*)
+	docker container rm (docker container ls -aq --filter name="^/${ARTIFACT_ID}")
 }
 
 function tail_logs {
@@ -34,12 +34,12 @@ function tail_logs {
 	)
 	
 	discoverArtifactId
-	docker container logs -f (docker container ls -q --filter name=${ARTIFACT_ID}-${container})
+	docker container logs -f (docker container ls -q --filter name="^/${ARTIFACT_ID}-${container}$")
 }
 
 function list {
 	discoverArtifactId
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 }
 
 switch ($args[0]) {

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.sh

@@ -1,42 +1,42 @@
 #!/bin/sh
 
 discoverArtifactId() {
-	ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
+	local ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
 }
 
 rebuild() {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 start() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 start_log() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad -Ddocker.showLogs process-classes
+	mvn -Drad -Ddocker.showLogs process-test-classes
 }
 
 stop() {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 	echo "Stopping containers ..."
-	docker container stop `docker container ls -q --filter name=${ARTIFACT_ID}-*`
+	docker container stop `docker container ls -q --filter name="^/${ARTIFACT_ID}"`
 	echo "Removing containers ..."
-	docker container rm `docker container ls -aq --filter name=${ARTIFACT_ID}-*`
+	docker container rm `docker container ls -aq --filter name="^/${ARTIFACT_ID}"`
 }
 
 tail_logs() {
 	discoverArtifactId
-	docker container logs -f `docker container ls -q --filter name=${ARTIFACT_ID}-$1`
+	docker container logs -f `docker container ls -q --filter name="^/${ARTIFACT_ID}-$1$"`
 }
 
 list() {
 	discoverArtifactId
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 }
 
 case "$1" in

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/ExampleBootstrap.java

@@ -20,16 +20,17 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
 import org.alfresco.service.ServiceRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 import org.springframework.stereotype.Component;
 
 /**
  * This class is an example of how you can use the Alfresco Java Public API on startup or shutdown.
  */
 @Component
-public class ExampleBootstrap implements InitializingBean, DisposableBean {
+public class ExampleBootstrap extends AbstractLifecycleBean {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 	
@@ -37,10 +38,29 @@ public class ExampleBootstrap implements InitializingBean, DisposableBean {
     @Autowired
     protected ServiceRegistry serviceRegistry;
     
+    @Value("${example.config.value:default}")
+    private String configValue;
+    
+    @Value("${example.config.value:#{null}}")
+    private String configValueWithNullDefault;
+    
+    /**
+     * This is called after Spring beans and configuration are injected, but
+     * before ACS services are ready.  So don't call any ACS services, start an
+     * ACS transaction, or try to create an authentication context.
+     */
+    @PostConstruct
+    private void init() {
+    }
+    
+    /**
+     * This is called after @PostConstruct and all the ACS services are
+     * initialized and ready.  You will have no authentication or transaction
+     * context.
+     */
     @Override
-	public void afterPropertiesSet() throws Exception {
-		if (this.logger.isTraceEnabled())
-			this.logger.trace("onStartup()");
+    protected void onBootstrap(ApplicationEvent event) {
+    	this.logger.trace("onBootstrap()");
 		
 		// provide some authority within the Alfresco context
 		AuthenticationUtil.runAsSystem(new RunAsWork<Void>() {
@@ -58,9 +78,13 @@ public class ExampleBootstrap implements InitializingBean, DisposableBean {
 		});
 	}
 
+    /**
+     * This is called after @PostConstruct and all the ACS services are
+     * initialized and ready.  You will have no authentication or transaction
+     * context.
+     */
     @Override
-	public void destroy() throws Exception {
-		if (this.logger.isTraceEnabled())
+    protected void onShutdown(ApplicationEvent event) {
     	this.logger.trace("onShutdown()");
 		
 		// provide some authority within the Alfresco context

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/ExampleEventListener.java

@@ -21,15 +21,15 @@ import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 import org.springframework.stereotype.Component;
 
 /**
  * This class is an example of how you can use the Alfresco Java Public API when Alfresco triggers an event.
  */
 @Component
-public class ExampleEventListener implements InitializingBean, OnCreateNodePolicy {
+public class ExampleEventListener extends AbstractLifecycleBean implements OnCreateNodePolicy {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 	
@@ -38,12 +38,16 @@ public class ExampleEventListener implements InitializingBean, OnCreateNodePolic
     protected ServiceRegistry serviceRegistry;
 	
     @Override
-	public void afterPropertiesSet() throws Exception {
+    protected void onBootstrap(ApplicationEvent event) {
 		this.bind();
 	}
 
+	/**
+	 * This must be called after the `PolicyComponent` is initialized/ready.
+	 * So you cannot call it from with `@PostConstruct` or using
+	 * `InitializingBean`.
+	 */
 	public void bind() {
-		if (this.logger.isTraceEnabled())
 		this.logger.trace("bind()");
 
 		// example listener
@@ -51,9 +55,15 @@ public class ExampleEventListener implements InitializingBean, OnCreateNodePolic
 				new JavaBehaviour(this, OnCreateNodePolicy.QNAME.getLocalName(), NotificationFrequency.TRANSACTION_COMMIT));
 	}
 	
+	/**
+	 * This will execute with the same authentication and transaction context
+	 * as was used to create the node, unless the binding is
+	 * `TRANSACTION_COMMIT`.  Then it will only have the same transaction
+	 * context and the authentication context used when starting the
+	 * transaction.
+	 */
 	@Override
 	public void onCreateNode(ChildAssociationRef childAssocRef) {
-		if (this.logger.isTraceEnabled())
 		this.logger.trace("onCreateNode('" + childAssocRef.getChildRef() + "')");
 		
 		// TODO do some work

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/ExampleGetWebScript.java

@@ -39,6 +39,11 @@ public class ExampleGetWebScript extends AbstractWebScript {
     @Autowired
     protected ServiceRegistry serviceRegistry;
 
+    /**
+     * This will have the authentication context of the authenticated user
+     * calling the REST endpoint.  The transaction context is defined in the
+     * web script descriptor.
+     */
     @Override
     public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException {
 		if (this.logger.isTraceEnabled())

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/ExampleJavaScriptRootObject.java

@@ -32,11 +32,17 @@ public class ExampleJavaScriptRootObject extends BaseProcessorExtension {
     @Autowired
     protected ServiceRegistry serviceRegistry;
     
+    /**
+     * An example method that called from within a JavaScript within the ACS
+     * application: `example.getMessage("example.property")`.  All simple
+     * parameter and return types are generally supported.
+     * 
+     * The `example` root name comes from the `module-context.xml` file.
+     */
     public String getMessage(String messageKey) {
     	if (this.logger.isTraceEnabled())
     		this.logger.trace("getMessage('" + messageKey + "')");
     	
-    	// just and example method, called in JS with: example.getMessage("example.property");
     	return this.serviceRegistry.getDictionaryService().getMessage(messageKey);
     }
 

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml

@@ -1,9 +1,10 @@
 <!-- Documentation: https://docs.alfresco.com/content-services/6.2/develop/reference/web-scripts-ref -->
-<webscript>
+<webscript xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="https://bitbucket.org/!api/2.0/snippets/inteligr8/AzMgbp/HEAD/files/snippet.txt">
 	<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>
+	<url>/exampleJava?paramName={paramValue}</url>
+	<format default="json"></format>
+	<authentication>user</authentication>
 </webscript>

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml

@@ -1,9 +1,10 @@
 <!-- Documentation: https://docs.alfresco.com/content-services/6.2/develop/reference/web-scripts-ref -->
-<webscript>
+<webscript xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="https://bitbucket.org/!api/2.0/snippets/inteligr8/AzMgbp/HEAD/files/snippet.txt">
 	<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>
+	<url>/exampleJs?paramName={paramValue}</url>
+	<format default="json"></format>
+	<authentication>guest</authentication>
 </webscript>

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/log4j2.properties

@@ -0,0 +1,2 @@
+logger.example.name=${package}
+logger.example.level=info

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/debug-log4j2.properties

@@ -0,0 +1,8 @@
+# Module debugging
+logger.example.level=trace
+
+# WebScript debugging
+logger.springframework-extensions-webscripts-ScriptLogger.level=debug
+
+# non-WebScript JavaScript execution debugging
+logger.alfresco-repo-jscript-ScriptLogger.level=debug

beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.ps1

@@ -5,27 +5,27 @@ function discoverArtifactId {
 
 function rebuild {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 function start_ {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 function start_log {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad "-Ddocker.showLogs" process-classes
+	mvn -Drad "-Ddocker.showLogs" process-test-classes
 }
 
 function stop_ {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 	echo "Stopping containers ..."
-	docker container stop (docker container ls -q --filter name=${ARTIFACT_ID}-*)
+	docker container stop (docker container ls -q --filter name="^/${ARTIFACT_ID}")
 	echo "Removing containers ..."
-	docker container rm (docker container ls -aq --filter name=${ARTIFACT_ID}-*)
+	docker container rm (docker container ls -aq --filter name="^/${ARTIFACT_ID}")
 }
 
 function tail_logs {
@@ -34,12 +34,12 @@ function tail_logs {
 	)
 	
 	discoverArtifactId
-	docker container logs -f (docker container ls -q --filter name=${ARTIFACT_ID}-${container})
+	docker container logs -f (docker container ls -q --filter name="^/${ARTIFACT_ID}-${container}$")
 }
 
 function list {
 	discoverArtifactId
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 }
 
 switch ($args[0]) {

beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.sh

@@ -1,42 +1,42 @@
 #!/bin/sh
 
 discoverArtifactId() {
-	ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
+	local ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
 }
 
 rebuild() {
 	echo "Rebuilding project ..."
-	mvn process-classes
+	mvn process-test-classes
 }
 
 start() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad process-classes
+	mvn -Drad process-test-classes
 }
 
 start_log() {
 	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
-	mvn -Drad -Ddocker.showLogs process-classes
+	mvn -Drad -Ddocker.showLogs process-test-classes
 }
 
 stop() {
 	discoverArtifactId
 	echo "Stopping Docker containers that supported rapid application development ..."
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 	echo "Stopping containers ..."
-	docker container stop `docker container ls -q --filter name=${ARTIFACT_ID}-*`
+	docker container stop `docker container ls -q --filter name="^/${ARTIFACT_ID}"`
 	echo "Removing containers ..."
-	docker container rm `docker container ls -aq --filter name=${ARTIFACT_ID}-*`
+	docker container rm `docker container ls -aq --filter name="^/${ARTIFACT_ID}"`
 }
 
 tail_logs() {
 	discoverArtifactId
-	docker container logs -f `docker container ls -q --filter name=${ARTIFACT_ID}-$1`
+	docker container logs -f `docker container ls -q --filter name="^/${ARTIFACT_ID}-$1$"`
 }
 
 list() {
 	discoverArtifactId
-	docker container ls --filter name=${ARTIFACT_ID}-*
+	docker container ls --filter name="^/${ARTIFACT_ID}"
 }
 
 case "$1" in

beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/log4j2.properties

@@ -0,0 +1,2 @@
+logger.example.name=${package}
+logger.example.level=info

beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/log4j2.properties

@@ -0,0 +1,74 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Set root logger level to error
+rootLogger.level=error
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+# All outputs currently set to be a ConsoleAppender.
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
+
+###### File appender definition #######
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=share.log
+appender.rolling.filePattern=share.log.%d{yyyy-MM-dd}
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type=TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval=1
+
+# Spring
+logger.springframework.name=org.springframework
+logger.springframework.level=warn
+
+# Turn off Spring remoting warnings that should really be info or debug.
+logger.springframework-remoting-support.name=org.springframework.remoting.support
+logger.springframework-remoting-support.level=error
+logger.springframework-util.name=org.springframework.util
+logger.springframework-util.level=error
+
+# MyFaces
+logger.apache-myfaces-util-DebugUtils.name=org.apache.myfaces.util.DebugUtils
+logger.apache-myfaces-util-DebugUtils.level=info
+logger.apache-myfaces-el-VariableResolverImpl.name=org.apache.myfaces.el.VariableResolverImpl
+logger.apache-myfaces-el-VariableResolverImpl.level=error
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.name=org.apache.myfaces.application.jsp.JspViewHandlerImpl
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.level=error
+logger.apache-myfaces-taglib.name=org.apache.myfaces.taglib
+logger.apache-myfaces-taglib.level=error
+
+# Alfresco
+logger.alfresco.name=org.alfresco
+logger.alfresco.level=error
+logger.alfresco-config.name=org.alfresco.config
+logger.alfresco-config.level=warn
+logger.alfresco-config-JndiObjectFactoryBean.name=org.alfresco.config.JndiObjectFactoryBean
+logger.alfresco-config-JndiObjectFactoryBean.level=warn
+logger.alfresco-web.name=org.alfresco.web
+logger.alfresco-web.level=info
+
+# Web Framework
+logger.springframework-extensions-webscripts.name=org.springframework.extensions.webscripts
+logger.springframework-extensions-webscripts.level=info
+logger.springframework-extensions-webscripts-ScriptLogger.name=org.springframework.extensions.webscripts.ScriptLogger
+logger.springframework-extensions-webscripts-ScriptLogger.level=warn
+logger.springframework-extensions-webscripts-ScriptDebugger.name=org.springframework.extensions.webscripts.ScriptDebugger
+logger.springframework-extensions-webscripts-ScriptDebugger.level=off
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+logger.freemarker-runtime.name=freemarker.runtime
+logger.freemarker-runtime.level=
+
+#-----------------------------------------------------------------------
+# Custom Share module logging goes here...
+#-----------------------------------------------------------------------
+
+logger.example.name=${package}
+logger.example.level=debug

beedk-activiti-ext-archetype/src/main/resources/archetype-resources/pom.xml

@@ -15,8 +15,8 @@
     	<maven.compiler.source>8</maven.compiler.source>
     	<maven.compiler.target>8</maven.compiler.target>
 
-		<activiti.version>5.23.0</activiti.version>
-		<spring.version>4.3.20.RELEASE</spring.version>
+		<activiti.version>7.11.0</activiti.version>
+		<spring.version>5.3.29</spring.version>
     </properties>
 
     <dependencies>
@@ -34,6 +34,39 @@
 	  	</dependency>
     </dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>io.repaint.maven</groupId>
+				<artifactId>tiles-maven-plugin</artifactId>
+				<version>2.40</version>
+				<extensions>true</extensions>
+				<configuration>
+					<tiles>
+						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-aps-ext-rad-tile -->
+						<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:1.1-SNAPSHOT</tile>
+					</tiles>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+	<profiles>
+		<profile>
+			<id>rad</id>
+			<activation>
+				<property>
+					<name>rad</name>
+				</property>
+			</activation>
+			<properties>
+				<aps.version>2.4.1</aps.version>
+				<!-- add properties here -->
+				<aps.tomcat.opts>-Dproperty-to-set=value</aps.tomcat.opts>
+			</properties>
+		</profile>
+	</profiles>
+    
     <repositories>
         <repository>
             <id>alfresco-public</id>

beedk-activiti-ext-archetype/src/main/resources/archetype-resources/rad.ps1

@@ -0,0 +1,74 @@
+
+function discoverArtifactId {
+	$script:ARTIFACT_ID=(mvn -q -Dexpression=project"."artifactId -DforceStdout help:evaluate)
+}
+
+function rebuild {
+	echo "Rebuilding project ..."
+	mvn process-test-classes
+}
+
+function start_ {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad process-test-classes
+}
+
+function start_log {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad "-Ddocker.showLogs" process-test-classes
+}
+
+function stop_ {
+	discoverArtifactId
+	echo "Stopping Docker containers that supported rapid application development ..."
+	docker container ls --filter name="^/${ARTIFACT_ID}"
+	echo "Stopping containers ..."
+	docker container stop (docker container ls -q --filter name="^/${ARTIFACT_ID}")
+	echo "Removing containers ..."
+	docker container rm (docker container ls -aq --filter name="^/${ARTIFACT_ID}")
+}
+
+function tail_logs {
+	param (
+		$container
+	)
+	
+	discoverArtifactId
+	docker container logs -f (docker container ls -q --filter name="^/${ARTIFACT_ID}-${container}$")
+}
+
+function list {
+	discoverArtifactId
+	docker container ls --filter name="^/${ARTIFACT_ID}"
+}
+
+switch ($args[0]) {
+	"start" {
+		start_
+	}
+	"start_log" {
+		start_log
+	}
+	"stop" {
+		stop_
+	}
+	"restart" {
+		stop_
+		start_
+	}
+	"rebuild" {
+		rebuild
+	}
+	"tail" {
+		tail_logs $args[1]
+	}
+	"containers" {
+		list
+	}
+	default {
+		echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
+	}
+}
+
+echo "Completed!"
+

beedk-activiti-ext-archetype/src/main/resources/archetype-resources/rad.sh

@@ -0,0 +1,71 @@
+#!/bin/sh
+
+discoverArtifactId() {
+	local ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
+}
+
+rebuild() {
+	echo "Rebuilding project ..."
+	mvn process-test-classes
+}
+
+start() {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad process-test-classes
+}
+
+start_log() {
+	echo "Rebuilding project and starting Docker containers to support rapid application development ..."
+	mvn -Drad -Ddocker.showLogs process-test-classes
+}
+
+stop() {
+	discoverArtifactId
+	echo "Stopping Docker containers that supported rapid application development ..."
+	docker container ls --filter name="^/${ARTIFACT_ID}"
+	echo "Stopping containers ..."
+	docker container stop `docker container ls -q --filter name="^/${ARTIFACT_ID}"`
+	echo "Removing containers ..."
+	docker container rm `docker container ls -aq --filter name="^/${ARTIFACT_ID}"`
+}
+
+tail_logs() {
+	discoverArtifactId
+	docker container logs -f `docker container ls -q --filter name="^/${ARTIFACT_ID}-$1$"`
+}
+
+list() {
+	discoverArtifactId
+	docker container ls --filter name="^/${ARTIFACT_ID}"
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	start_log)
+		start_log
+		;;
+	stop)
+		stop
+		;;
+	restart)
+		stop
+		start
+		;;
+	rebuild)
+		rebuild
+		;;
+	tail)
+		tail_logs $2
+		;;
+	containers)
+		list
+		;;
+	*)
+		echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]"
+		exit 1
+esac
+
+echo "Completed!"
+