Merge branch 'master' of https://github.com/Alfresco/alfresco-sdk into fix/PRODSEC-9642-commons-io-vulnerability

* [APPS-3043] Upgrade to spring 6.1

* [APPS-3043] Upgrade to spring 6.1

.ci.settings.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  
+  <servers>
+    <server>
+      <id>alfresco-private-repository</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>activiti-private-repository</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-public-snapshots</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-public</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-plugin-public</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-plugin-public-snapshots</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-internal-snapshots</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-internal</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>central-releases-staging</id>
+      <username>${env.MAVEN_CENTRAL_USERNAME}</username>
+      <password>${env.MAVEN_CENTRAL_PASSWORD}</password>
+    </server>
+  </servers>
+</settings>

.github/workflows/ci.yml

@@ -0,0 +1,164 @@
+name: Alfresco SDK CI
+
+on:
+  pull_request:
+    branches:
+      - master
+      - fix/**
+      - feature/**
+      - sdk-4.5
+  push:
+    branches:
+      - master
+      - fix/**
+      - feature/**
+      - sdk-4.5
+  workflow_dispatch:
+
+env:
+  MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+  MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+  MAVEN_CENTRAL_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+  MAVEN_CENTRAL_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
+
+jobs:
+  pre_commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v7.0.0
+
+  veracode_sca:
+    name: "Veracode - Source Clear Scan (SCA)"
+    runs-on: ubuntu-latest
+    if: >
+      github.ref_name == 'master' ||
+      github.event_name == 'pull_request'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - name: "Clean-up SNAPSHOT artifacts"
+        run: find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.0.0
+        continue-on-error: true
+        with:
+          srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
+
+  build:
+    name: "Build application"
+    runs-on: ubuntu-latest
+    needs: [pre_commit]
+    if: "!contains(github.event.head_commit.message, '[skip tests]')"
+    env:
+      MAVEN_CLI_OPTS: >
+        -B -q -e -fae -V -DinstallAtEnd=true -U
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - name: "Build"
+        run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+      - name: "Verify"
+        run: mvn $MAVEN_CLI_OPTS verify -Dlogging.root.level=off -Dspring.main.banner-mode=off
+
+  tests:
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-latest
+    needs: [build]
+    if: >
+      !(failure() || cancelled()) &&
+      !contains(github.event.head_commit.message, '[skip tests]')
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: "current version Java 17"
+            java-version: 17
+          - name: "23.3 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-233-tests
+          - name: "23.3 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-233-tests
+          - name: "23.2 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-232-tests
+          - name: "23.2 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-232-tests
+          - name: "23.1 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-231-tests
+          - name: "23.1 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-231-tests
+          - name: "7.4 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-74-tests
+          - name: "7.4 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-74-tests
+          - name: "7.4 Enterprise Java 11"
+            java-version: 11
+            suite: -Penterprise-74-tests
+          - name: "7.4 Community Java 11"
+            java-version: 11
+            suite: -Pcommunity-74-tests
+          - name: "7.3 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-73-tests
+          - name: "7.3 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-73-tests
+          - name: "7.3 Enterprise Java 11"
+            java-version: 11
+            suite: -Penterprise-73-tests
+          - name: "7.3 Community Java 11"
+            java-version: 11
+            suite: -Pcommunity-73-tests
+          - name: "7.2 Enterprise"
+            java-version: 11
+            suite: -Penterprise-72-tests
+          - name: "7.2 Community"
+            java-version: 11
+            suite: -Pcommunity-72-tests
+          - name: "7.1 Enterprise"
+            java-version: 11
+            suite: -Penterprise-71-tests
+          - name: "7.1 Community"
+            java-version: 11
+            suite: -Pcommunity-71-tests
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+        with:
+          java-version: ${{ matrix.java-version }}
+      - name: "Login to Docker Hub"
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: "Login to Quay.io"
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: "Build"
+        run: mvn clean install -B ${{ matrix.suite }}
+
+  publish:
+    name: "Publish artifacts"
+    runs-on: ubuntu-latest
+    needs: [tests]
+    if: >
+      contains(github.event.head_commit.message, '[publish]')
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - name: "Build"
+        run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+      - name: "Publish"
+        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
+        run: mvn deploy $MAVEN_CLI_OPTS -DskipTests

.pre-commit-config.yaml

@@ -0,0 +1,10 @@
+default_language_version:
+  # force all unspecified python hooks to run python3
+  python: python3
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.4.0
+    hooks:
+      - id: check-yaml
+        args: [--allow-multiple-documents]

README.md

@@ -1,13 +1,30 @@
 # [![Alfresco SDK logo](https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg)](#features) Alfresco SDK
 
-This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to build extensions for the Alfresco Digital Business Platform. It is based on [Apache Maven](http://maven.apache.org/), compatible with major IDEs and enables Rapid Application Development (RAD) and Test Driven Development (TDD).
+
+[![Build Status](https://github.com/Alfresco/alfresco-sdk/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/Alfresco/alfresco-sdk/actions/workflows/ci.yml)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
+![GitHub](https://img.shields.io/github/license/Alfresco/alfresco-sdk?color=brightgreen)
+
+This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to build extensions for the Alfresco Digital Business Platform. It is based on 
+[Apache Maven](http://maven.apache.org/), compatible with major IDEs and enables [Rapid Application Development (RAD)](https://en.wikipedia.org/wiki/Rapid_application_development) 
+and [Test Driven Development (TDD)](https://en.wikipedia.org/wiki/Test-driven_development).
 
 ## License
 This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) license.
 If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section.
 
 ## News
-
+- 2024-08: Alfresco SDK 4.9.0 released
+- 2024-03: Alfresco SDK 4.8.0 released
+- 2023-11: Alfresco SDK 4.7.0 released
+- 2023-06: Alfresco SDK 4.6.0 released
+- 2022-10: Alfresco SDK 4.5.0 released
+- 2022-03: Alfresco SDK 4.4.0 released
+- 2021-10: Alfresco SDK 4.3.0 released
+- 2021-02: Alfresco SDK 4.2.0 released
+- 2019-10: Alfresco SDK 4.1.0 released
+- 2019-03: Alfresco SDK 4.0.0 released
+- 2019-03: Alfresco SDK 3.1.0 released
 - 2017-06-23: Alfresco SDK 3.0.1 released, [containing a critical bugfix](https://github.com/Alfresco/alfresco-sdk/issues/461)
 - 2017-04-01: Alfresco SDK 3.0.0 released
 - 2017-03-27: After years of hard work, countless iterations and gathering feedback, SDK 3.0 has finally been merged into the master branch, ready for release in the coming days
@@ -20,19 +37,83 @@ If you are an Enterprise customer check the [Support](#alfresco-enterprise-custo
 
 ## User Getting Started
 
+### Important Notice about ACS 7.2
+
+Please refer to https://github.com/Alfresco/alfresco-sdk/issues/635 to fix the Search Services 403 problem.
+
+### Important Notice about ACS 7.1 
+
+#### Share Version Number
+
+Since ACS 7.1, Share build pipeline has been refactored, and you now have to specify the internal 
+Share version number, in addition to the version of the image, because they are not the same anymore.
+
+This number can be located in the main pom.xml of the project used to build Share, hence: 
+
+- property `<alfresco-community-share.version>` of [acs-community-packaging](https://github.com/Alfresco/acs-community-packaging/blob/7.1.0/pom.xml#L17) (Community)  
+- property `<alfresco-enterprise-share.version>`of [acs-packaging](https://github.com/Alfresco/acs-packaging/blob/7.1.0.1/pom.xml#L18) (Enterprise) 
+
+So, if for example you want to use the community version of `7.1.0.1`, you can go on acs-community-packaging, 
+open the `7.1.0.1` release tag, browse its files, open the pom.xml in the root, 
+then copy the value of `<alfresco-community-share.version>`. 
+
+You'll then need to paste this value inside the SDK property `<alfresco.share.version>`.
+
+#### Alternate Docker User
+
+- ACS 6 used to run everything as `root`.
+- ACS 7 introduced an `alfresco` user, that should've been used after the `root` user completed its configurations in the Dockerfile.
+
+Due to a bug, this wasn't working in earlier SDKs, and has been fixed in SDK 4.3.
+
+In order to be retro-compatible with ACS 6, however, the user is specified in the SDK property `<alfresco.platform.docker.user>`.
+
+Hence, its values (already in place) are `root` for ACS 6, and `alfresco` for ACS 7+.
+
+#### Log file location
+
+To prevent writing permission problems when logging with the non-root user, 
+the `alfresco.log` file has also been moved to a more appropriate location (Tomcat logs instead of Tomcat root).
+
+### Important Notice about Version Numbers
+
+In Q4 2020, Alfresco Platform has undergone a major structural refactoring.
+
+Depending on the Platform version desired, you might need to use SDK 4.1, 4.3, 4.4, 4.5, 4.6, 4.7 or SDK 4.8 instead of SDK 4.9.
+
+- For Enterprise and Community versions of 7.x, SDK 4.4 or higher must be used
+- For Enterprise versions of 6.0.x, 6.1.x, 6.2.x newer than November 2020, SDK 4.3 must be used
+- For Enterprise and Community versions of 6.0.x, 6.1.x, 6.2.x older than November 2020, SDK 4.1 must be used
+
+It's also important to remember that:
+
+- Community Platform versions are built by [acs-community-packaging](https://github.com/Alfresco/acs-community-packaging)
+- Community Docker images are published on [Docker Hub](https://hub.docker.com/r/alfresco/alfresco-content-repository-community/tags?page=1&ordering=last_updated)
+- Enterprise Platform versions are built by [acs-packaging](https://github.com/Alfresco/acs-packaging)
+- Enterprise Docker images are published on *Quay.io*
+
 ### Latest Documentation
-To get started with **Alfresco SDK 4.0.x** (latest) visit the [Alfresco Documentation](https://docs.alfresco.com/6.0/concepts/dev-for-developers.html) (documentation pending).
+To get started with **Alfresco SDK 4.9.x** (latest) visit the [Alfresco Documentation](docs/README.md).
 
 #### Documentation about Previous Versions
-| SDK Version  | Alfresco Enterprise Version       |  Alfresco Community Version       | Documentation  |
+| SDK Version |                       Alfresco Enterprise Version                        |                    Alfresco Community Version                    | Documentation                                                                                                                                |
-| ------------- |:-------------:| :-----:|:-----|
+|-------------|:------------------------------------------------------------------------:|:----------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------|
-| SDK 3.0   | Alfresco 5.2.x | Alfresco 5.2.x | http://docs.alfresco.com/5.2/concepts/sdk-intro.html |
+| SDK 4.9     | Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x/ 23.2.x / 23.3.x | Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.2.x / 23.3.x | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 2.2   | Alfresco 5.1.x | Alfresco 5.1.x | https://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html |
+| SDK 4.8     |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x/ 23.2.x      |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.2.x      | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 2.1   | Alfresco 5.0.1 | Alfresco 5.0.d | https://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html |
+| SDK 4.7     |         Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x          |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x      | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 2.0   | Alfresco 5.0.0 | Alfresco 5.0.c | https://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html |
+| SDK 4.6     |              Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x              |          Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x          | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 1.1.1 | Alfresco 4.2.x | Alfresco 4.2.x | https://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html |
+| SDK 4.5     |                  Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x                  |              Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x              | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-
+| SDK 4.4     |                      Alfresco 7.0.x / 7.1.x / 7.2.x                      |                  Alfresco 7.0.x / 7.1.x / 7.2.x                  | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-
+| SDK 4.3     |              Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x / 7.1.x              |                      Alfresco 7.0.x / 7.1.x                      | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
+| SDK 4.2     |                  Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x                  |                          Alfresco 7.0.x                          | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
+| SDK 4.1     |                      Alfresco 6.0.x / 6.1.x / 6.2.x                      |                  Alfresco 6.0.x / 6.1.x / 6.2.x                  | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.1/docs/README.md                                                                         |
+| SDK 4.0     |                          Alfresco 6.0.x / 6.1.x                          |                      Alfresco 6.0.x / 6.1.x                      | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.0/docs/README.md                                                                         |
+| SDK 3.1     |                              Alfresco 5.2.x                              |                          Alfresco 5.2.x                          | http://docs.alfresco.com/5.2/concepts/sdk-intro.html                                                                                         |
+| SDK 3.0     |                              Alfresco 5.2.x                              |                          Alfresco 5.2.x                          | http://docs.alfresco.com/5.2/concepts/sdk-intro.html                                                                                         |
+| SDK 2.2     |                              Alfresco 5.1.x                              |                          Alfresco 5.1.x                          | https://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html                                                                               |
+| SDK 2.1     |                              Alfresco 5.0.1                              |                          Alfresco 5.0.d                          | https://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html                                                                            |
+| SDK 2.0     |                              Alfresco 5.0.0                              |                          Alfresco 5.0.c                          | https://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html                                                                            |
+| SDK 1.1.1   |                              Alfresco 4.2.x                              |                          Alfresco 4.2.x                          | https://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html                                                                   |
 
 ## Reporting Issues and Community Support
 Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open) or join us on the [IRC Channel](http://chat.alfresco.com/).
@@ -43,12 +124,13 @@ please check the [SDK Support status](http://www.alfresco.com/services/subscript
 for the version you are using.  If your version is in Limited or Full Support and you need help, visit the [Support Portal](http://support.alfresco.com).
 
 ## Maven repositories
-- As of version 2.0-beta-1, The Alfresco SDK is released in [Maven Central](http://search.maven.org/#search|ga|1|alfresco-sdk). Previous versions are available in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/).
+- As of version 2.0-beta-1, The Alfresco SDK is released in [Maven Central](http://search.maven.org/#search|ga|1|alfresco-sdk). Previous versions are available 
+in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/).
 - Alfresco (Community and Enterprise) artifacts are  hosted in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/).
 - Alfresco Community artifacts (JARs, WARs, AMPs, poms) and SDK artifacts are publicly available.
 
-*NOTE:* By default the Alfresco SDK will use Community Edition releases but it can be configured to use Enterprise Edition releases.  Enterprise and Premier customers can use the SDK with
+*NOTE:* By default the Alfresco SDK will use Community Edition releases but it can be configured to use Enterprise Edition releases. Enterprise and Premier 
-Enterprise Edition releases by following the process described in [Working with Enterprise](https://docs.alfresco.com/5.2/concepts/sdk-using-enterprise.html)
+customers can use the SDK with Enterprise Edition releases by following the process described in [Working with Enterprise](docs/advanced-topics/working-with-enterprise/README.md).
 
 ### Alfresco Artifacts Repository
 
@@ -72,5 +154,9 @@ To test new unreleased (unsupported) features, you can use the following snippet
 </repository>
 ```
 
+## Docker registries
+- Alfresco Community Docker images are publicly available at the [Alfresco's Docker Hub profile](https://hub.docker.com/u/alfresco/).
+- Alfresco Enterprise Docker images are hosted at [Quay.io](https://quay.io/). Its configuration process is described in detail in [How to configure private Alfresco Docker registry](docs/advanced-topics/working-with-enterprise/enterprise-docker-registry.md).
+
 ## For Developers that want to contribute to the SDK
 See the [Developers Wiki page](https://github.com/Alfresco/alfresco-sdk/wiki/Developer-Wiki).

archetypes/alfresco-allinone-archetype/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.0.0-beta-1</version>
+    <version>5.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -48,6 +48,7 @@
                 <delimiters>
                     <delimiter>@@</delimiter>
                 </delimiters>
+                <addDefaultExcludes>false</addDefaultExcludes>
             </configuration>
         </plugin>
       </plugins>

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

@@ -10,9 +10,9 @@
         </requiredProperty>
     </requiredProperties>
     <modules>
-        <module id="${rootArtifactId}-platform-jar"
+        <module id="${rootArtifactId}-platform"
-                name="${rootArtifactId}-platform-jar"
+                name="${rootArtifactId}-platform"
-                dir="__rootArtifactId__-platform-jar">
+                dir="__rootArtifactId__-platform">
             <fileSets>
                 <fileSet filtered="false" packaged="false" encoding="UTF-8">
                     <directory>src/main/assembly</directory>
@@ -50,9 +50,9 @@
             </fileSets>
         </module>
 
-        <module id="${rootArtifactId}-share-jar"
+        <module id="${rootArtifactId}-share"
-                name="${rootArtifactId}-share-jar"
+                name="${rootArtifactId}-share"
-                dir="__rootArtifactId__-share-jar">
+                dir="__rootArtifactId__-share">
             <fileSets>
                 <fileSet filtered="false" packaged="false" encoding="UTF-8">
                     <directory>src/main/assembly</directory>
@@ -97,7 +97,9 @@
             </fileSets>
         </module>
 
-        <module id="integration-tests" name="integration-tests" dir="integration-tests">
+        <module id="${rootArtifactId}-integration-tests"
+                name="${rootArtifactId}-integration-tests"
+                dir="__rootArtifactId__-integration-tests">
             <fileSets>
                 <fileSet filtered="true" packaged="true" encoding="UTF-8">
                     <directory>src/main/java</directory>
@@ -118,12 +120,6 @@
                 name="${rootArtifactId}-platform-docker"
                 dir="__rootArtifactId__-platform-docker">
             <fileSets>
-                <fileSet encoding="UTF-8" filtered="false">
-                    <directory>src/main/docker/license</directory>
-                    <includes>
-                        <include>**</include>
-                    </includes>
-                </fileSet>
                 <fileSet encoding="UTF-8" filtered="false">
                     <directory>src/main/docker</directory>
                     <includes>
@@ -187,6 +183,7 @@
         <fileSet encoding="UTF-8" filtered="true">
             <directory></directory>
             <includes>
+                <include>.gitignore</include>
                 <include>run.sh</include>
                 <include>run.bat</include>
                 <include>README.md</include>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/.gitignore

@@ -0,0 +1,38 @@
+**.log*
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+# Eclipse
+.metadata
+.project
+.classpath
+bin/
+tmp/
+*.tmp
+.settings/
+.loadpath
+.recommenders
+
+# IntelliJ IDEA
+**.idea
+**.iml
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# macOS
+*.DS_Store

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

@@ -1,6 +1,6 @@
-# Alfresco AIO Project - SDK 4.0
+# Alfresco AIO Project - SDK 4.9
 
-This is an All-In-One (AIO) project for Alfresco SDK 4.0.
+This is an All-In-One (AIO) project for Alfresco SDK 4.9.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 
@@ -14,6 +14,8 @@ All the services of the project are now run as docker containers. The run script
 
  * `build_start`. Build the whole project, recreate the ACS and Share docker images, start the dockerised environment composed by ACS, Share, ASS and 
  PostgreSQL and tail the logs of all the containers.
+ * `build_start_it_supported`. Build the whole project including dependencies required for IT execution, recreate the ACS and Share docker images, start the 
+ dockerised environment composed by ACS, Share, ASS and PostgreSQL and tail the logs of all the containers.
  * `start`. Start the dockerised environment without building the project and tail the logs of all the containers.
  * `stop`. Stop the dockerised environment.
  * `purge`. Stop the dockerised container and delete all the persistent data (docker volumes).

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

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
     <name>Integration Tests Module</name>
-    <description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.0</description>
+    <description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.9</description>
     <packaging>jar</packaging> <!-- Note. this just runs Integration Tests, but it needs to be a JAR otherwise
                                             nothing is compiled (i.e. you cannot set it to pom) -->
 
@@ -22,7 +22,7 @@
              that is generated for the AIO project -->
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-platform-jar</artifactId>
+            <artifactId>${rootArtifactId}-platform</artifactId>
             <version>${version}</version>
             <scope>test</scope>
         </dependency>
@@ -42,7 +42,6 @@
             <plugin>
                 <groupId>org.zeroturnaround</groupId>
                 <artifactId>jrebel-maven-plugin</artifactId>
-                <version>${jrebel.version}</version>
                 <configuration>
                     <rebelXmlDirectory>${project.build.testOutputDirectory}</rebelXmlDirectory>
                 </configuration>
@@ -52,7 +51,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -67,35 +65,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.19.1</version>
                 <configuration>
                     <systemPropertyVariables>
                         <acs.endpoint.path>${test.acs.endpoint.path}</acs.endpoint.path>
                     </systemPropertyVariables>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>integration-test</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>verify-test</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>2.19.1</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

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

@@ -50,10 +50,9 @@ public class DemoComponentIT extends AbstractAlfrescoIT {
         DemoComponent demoComponent = (DemoComponent) getApplicationContext().getBean("${package}.DemoComponent");
         NodeRef companyHome = demoComponent.getCompanyHome();
         assertNotNull(companyHome);
-        String companyHomeName = (String) getServiceRegistry().getNodeService().getProperty(
+        String companyHomePath = getServiceRegistry().getNodeService().getPath(companyHome).toPrefixString(getServiceRegistry().getNamespaceService());
-                companyHome, ContentModel.PROP_NAME);
+        assertNotNull(companyHomePath);
-        assertNotNull(companyHomeName);
+        assertEquals("/app:company_home", companyHomePath);
-        assertEquals("Company Home", companyHomeName);
     }
 
     @Test

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

@@ -19,9 +19,28 @@
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-platform-jar</artifactId>
+            <artifactId>${rootArtifactId}-platform</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-integration-tests</artifactId>
+            <version>${version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <!-- Add any additional AMPs or extension JARs here that you want to be deployed in Alfresco -->
+        <!-- IMPORTANT: 
+             If using amp extensions only, add <includeTypes>amp</includeTypes> to the "collect-extensions" execution below.
+             If using both amp and jar extensions, you have to add: 
+                <exclusions>
+                  <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                  </exclusion>
+                </exclusions>
+             to each amp dependency definition.
+         -->
     </dependencies>
 
     <build>
@@ -29,75 +48,30 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.0.2</version>
                 <executions>
                     <!-- Copy the repository extension and the dependencies required for execute integration tests -->
                     <execution>
-                        <id>copy-repo-extension</id>
+                        <id>collect-test-artifacts</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>${groupId}</groupId>
-                                    <artifactId>${rootArtifactId}-platform-jar</artifactId>
-                                    <version>${version}</version>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/extensions</outputDirectory>
-                                </artifactItem>
-                                <!-- Test dependencies -->
-                                <!-- We need these dependencies installed in ACS in order to execute the test remotely making use of the Alfresco RAD module -->
-                                <artifactItem>
-                                    <groupId>org.alfresco.maven</groupId>
-                                    <artifactId>alfresco-rad</artifactId>
-                                    <version>${alfresco.sdk.version}</version>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/extensions</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>${groupId}</groupId>
-                                    <artifactId>integration-tests</artifactId>
-                                    <version>${version}</version>
-                                    <classifier>tests</classifier>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/extensions</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>junit</groupId>
-                                    <artifactId>junit</artifactId>
-                                    <version>4.12</version>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/extensions</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.mockito</groupId>
-                                    <artifactId>mockito-all</artifactId>
-                                    <version>1.9.5</version>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/extensions</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.httpcomponents</groupId>
-                                    <artifactId>httpclient</artifactId>
-                                    <version>4.5.2</version>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/extensions</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <!-- Copy other dependencies (JARs or AMPs) declared in the platform module -->
-                    <execution>
-                        <id>copy-third-party-dependencies</id>
                         <phase>pre-integration-test</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/extensions</outputDirectory>
+                            <excludeScope>compile</excludeScope>
+                        </configuration>
+                    </execution>
+                    <!-- Collect extensions (JARs or AMPs) declared in this module do be deployed to docker -->
+                    <execution>
+                        <id>collect-extensions</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/extensions</outputDirectory>
                             <includeScope>runtime</includeScope>
+                            <!-- IMPORTANT: if using amp dependencies only, add <includeTypes>amp</includeTypes> -->
                         </configuration>
                     </execution>
                 </executions>
@@ -106,7 +80,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>copy-and-filter-docker-resources</id>
@@ -123,6 +96,7 @@
                                     <excludes>
                                         <exclude>**/*.jar</exclude>
                                         <exclude>**/*.so</exclude>
+                                        <exclude>**/*.gz</exclude>
                                     </excludes>
                                 </resource>
                             </resources>
@@ -143,6 +117,7 @@
                                     <includes>
                                         <include>**/*.jar</include>
                                         <include>**/*.so</include>
+                                        <include>**/*.gz</include>
                                     </includes>
                                 </resource>
                             </resources>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/Dockerfile

@@ -1,6 +1,9 @@
 FROM ${docker.acs.image}:${alfresco.platform.version}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=${alfresco.platform.docker.user} 
+
+USER root
 
 # Copy Dockerfile to avoid an error if no JARs exist
 COPY Dockerfile extensions/*.jar $TOMCAT_DIR/webapps/alfresco/WEB-INF/lib/
@@ -11,8 +14,16 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
               $TOMCAT_DIR/amps $TOMCAT_DIR/webapps/alfresco -directory -nobackup -force
 
 COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global.properties
-COPY dev-log4j.properties $TOMCAT_DIR/shared/classes/alfresco/extension
+COPY dev-log4j2.properties $TOMCAT_DIR/shared/classes/alfresco/extension/dev-log4j2.properties
 COPY disable-webscript-caching-context.xml $TOMCAT_DIR/shared/classes/alfresco/extension
 
 # Copy Dockerfile to avoid an error if no license file exists
-COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/
+COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/
+
+# Move the log file
+RUN sed -i -e "s_appender.rolling.fileName\=alfresco.log_appender.rolling.fileName\=${TOMCAT_DIR}/logs\/alfresco.log_" \
+        ${TOMCAT_DIR}/shared/classes/alfresco/extension/dev-log4j2.properties && \
+    sed -i -e "s_appender.rolling.filePattern=alfresco.log.%d{yyyy-MM-dd}_appender.rolling.filePattern\=${TOMCAT_DIR}/logs\/alfresco.log.%d{yyyy-MM-dd}_" \
+        ${TOMCAT_DIR}/shared/classes/alfresco/extension/dev-log4j2.properties
+
+USER ${USERNAME}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties

@@ -62,7 +62,8 @@ db.driver=org.postgresql.Driver
 index.subsystem.name=solr6
 solr.host=${rootArtifactId}-ass
 solr.port=8983
-solr.secureComms=none
+solr.secureComms=secret
+solr.sharedSecret=secret
 
 db.username=alfresco
 db.password=alfresco
@@ -76,4 +77,12 @@ db.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
 cifs.enabled=false
 ftp.enabled=false
 
-csrf.filter.enabled=false
+csrf.filter.enabled=false
+
+# Embedded broker without persistence
+messaging.broker.url=vm://localhost?broker.persistent=false
+
+# Disable ATS
+transform.service.enabled=false
+local.transform.service.enabled=false
+legacy.transform.service.enabled=false

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/dev-log4j.properties

@@ -1,270 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Set root logger level to error
-log4j.rootLogger=error, Console, File
-
-
-# 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
-
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=alfresco.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
-
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
-log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-log4j.logger.org.hibernate.type=warn
-log4j.logger.org.hibernate.cfg.SettingsFactory=warn
-
-# 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
-
-# Axis/WSS4J
-log4j.logger.org.apache.axis=info
-log4j.logger.org.apache.ws=info
-
-# CXF
-log4j.logger.org.apache.cxf=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
-
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
-# log prepared statement cache activity log4j.logger.org.hibernate.ps.PreparedStatementCache=info
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.repo.admin=info
-log4j.logger.org.alfresco.repo.transaction=warn
-log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
-log4j.logger.org.alfresco.repo.model.filefolder=warn
-log4j.logger.org.alfresco.repo.tenant=info
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
-log4j.logger.org.alfresco.repo.management.subsystems=warn
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
-log4j.logger.org.alfresco.repo.security.sync=info
-log4j.logger.org.alfresco.repo.security.person=info
-
-log4j.logger.org.alfresco.sample=info
-log4j.logger.org.alfresco.web=info
-#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-#log4j.logger.org.alfresco.web.bean.clipboard=debug
-log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-#log4j.logger.org.alfresco.web.page=debug
-
-log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
-
-log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
-log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
-
-# Specific patches
-log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
-log4j.logger.org.alfresco.repo.version.VersionMigrator=info
-
-log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
-log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
-log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
-log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
-log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
-log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
-log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
-log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
-log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
-log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
-log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
-log4j.logger.org.alfresco.enterprise.repo.cluster=info
-log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
-
-#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-log4j.logger.org.alfresco.repo.node.db.NodeStringLengthWorker=info
-
-log4j.logger.org.alfresco.repo.workflow=info
-
-# CIFS server debugging
-log4j.logger.org.alfresco.smb.protocol=error
-#log4j.logger.org.alfresco.smb.protocol.auth=debug
-#log4j.logger.org.alfresco.acegi=debug
-
-# FTP server debugging
-log4j.logger.org.alfresco.ftp.protocol=error
-#log4j.logger.org.alfresco.ftp.server=debug
-
-# WebDAV debugging
-#log4j.logger.org.alfresco.webdav.protocol=debug
-log4j.logger.org.alfresco.webdav.protocol=info
-
-# NTLM servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
-
-# Kerberos servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
-
-# File servers
-log4j.logger.org.alfresco.fileserver=warn
-
-# Repo filesystem debug logging
-#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-log4j.logger.org.alfresco.repo.node.integrity=ERROR
-
-# Indexer debugging
-log4j.logger.org.alfresco.repo.search.Indexer=error
-#log4j.logger.org.alfresco.repo.search.Indexer=debug
-
-log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
-#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
-
-# Audit debugging
-# log4j.logger.org.alfresco.repo.audit=DEBUG
-# log4j.logger.org.alfresco.repo.audit.model=DEBUG
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-log4j.logger.alfresco.missingProperties=warn
-
-# Dictionary/Model debugging
-log4j.logger.org.alfresco.repo.dictionary=warn
-log4j.logger.org.alfresco.repo.dictionary.types.period=warn
-
-# Virtualization Server Registry
-log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
-
-# Spring context runtime property setter
-log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
-
-# Debugging options for clustering
-log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
-log4j.logger.org.alfresco.repo.content.replication=error
-
-#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
-
-# Activity service
-log4j.logger.org.alfresco.repo.activities=warn
-
-# User usage tracking
-log4j.logger.org.alfresco.repo.usage=info
-
-# Sharepoint
-log4j.logger.org.alfresco.module.vti=info
-
-# Forms Engine
-log4j.logger.org.alfresco.web.config.forms=info
-log4j.logger.org.alfresco.web.scripts.forms=info
-
-# CMIS
-log4j.logger.org.alfresco.opencmis=error
-log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
-log4j.logger.org.alfresco.cmis=error
-log4j.logger.org.alfresco.cmis.dictionary=warn
-log4j.logger.org.apache.chemistry.opencmis=info
-log4j.logger.org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet=OFF
-log4j.logger.org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet=OFF
-
-# IMAP
-log4j.logger.org.alfresco.repo.imap=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
-log4j.logger.org.jbpm.graph.def.GraphElement=fatal
-
-#log4j.logger.org.alfresco.repo.googledocs=debug
-
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Repository
-log4j.logger.org.alfresco.repo.web.scripts=warn
-log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
-log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
-log4j.logger.org.alfresco.repo.jscript=error
-log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
-log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
-
-log4j.logger.org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl=off
-log4j.logger.org.alfresco.repo.domain.schema.script.ScriptExecutorImpl=info
-
-log4j.logger.org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl=info
-
-# Bulk Filesystem Import Tool
-log4j.logger.org.alfresco.repo.bulkimport=warn
-
-# 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=
-
-# Metadata extraction
-log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
-
-# Reduces PDFont error level due to ALF-7105
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
-
-# no index support
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
-
-# lucene index warnings
-log4j.logger.org.alfresco.repo.search.impl.lucene.index.IndexInfo=warn
-
-# Warn about RMI socket bind retries.
-log4j.logger.org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory=warn
-
-log4j.logger.org.alfresco.repo.usage.RepoUsageMonitor=info
-
-# Authorization
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationService=info
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor=warn
-
-#-----------------------------------------------------------------------
-# Platform module logging
-#-----------------------------------------------------------------------
-log4j.logger.${package}.platformsample.DemoComponent=debug
-log4j.logger.${package}.platformsample.HelloWorldWebScript=debug
-
-
-

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/dev-log4j2.properties

@@ -0,0 +1,412 @@
+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
+# use log4j NDC to replace %x with tenant domain / username
+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=alfresco.log
+appender.rolling.filePattern=alfresco.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
+
+# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4J2HierarchyInit)
+# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
+# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
+# Log4j2 addLoggerMBean as long as the logger exists and has been loaded.
+
+# Hibernate
+logger.hibernate.name=org.hibernate
+logger.hibernate.level=error
+
+logger.hibernate-util-JDBCExceptionReporter.name=org.hibernate.util.JDBCExceptionReporter
+logger.hibernate-util-JDBCExceptionReporter.level=fatal
+
+logger.hibernate-event-def-AbstractFlushingEventListener.name=org.hibernate.event.def.AbstractFlushingEventListener
+logger.hibernate-event-def-AbstractFlushingEventListener.level=fatal
+
+logger.hibernate-type.name=org.hibernate.type
+logger.hibernate-type.level=warn
+
+logger.hibernate-cfg-SettingsFactory.name=org.hibernate.cfg.SettingsFactory
+logger.hibernate-cfg-SettingsFactory.level=warn
+
+# 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
+
+# Axis/WSS4J
+logger.apache-axis.name=org.apache.axis
+logger.apache-axis.level=info
+
+logger.apache-ws.name=org.apache.ws
+logger.apache-ws.level=info
+
+# CXF
+logger.apache-cxf.name=org.apache.cxf
+logger.apache-cxf.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
+
+# OpenOfficeConnection
+logger.sf-jooreports-openoffice-connection.name=net.sf.jooreports.openoffice.connection
+logger.sf-jooreports-openoffice-connection.level=fatal
+
+# log prepared statement cache activity log4j.logger.org.hibernate.ps.PreparedStatementCache=info
+
+# Alfresco
+logger.alfresco.name=org.alfresco
+logger.alfresco.level=error
+
+logger.alfresco-repo-admin.name=org.alfresco.repo.admin
+logger.alfresco-repo-admin.level=info
+
+logger.alfresco-repo-transaction.name=org.alfresco.repo.transaction
+logger.alfresco-repo-transaction.level=warn
+
+logger.alfresco-repo-cache-TransactionalCache.name=org.alfresco.repo.cache.TransactionalCache
+logger.alfresco-repo-cache-TransactionalCache.level=warn
+
+logger.alfresco-repo-model-filefolder.name=org.alfresco.repo.model.filefolder
+logger.alfresco-repo-model-filefolder.level=warn
+
+logger.alfresco-repo-tenant.name=org.alfresco.repo.tenant
+logger.alfresco-repo-tenant.level=info
+
+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-config-JBossEnabledWebApplicationContext.name=org.alfresco.config.JBossEnabledWebApplicationContext
+logger.alfresco-config-JBossEnabledWebApplicationContext.level=warn
+
+logger.alfresco-repo-management-subsystems.name=org.alfresco.repo.management.subsystems
+logger.alfresco-repo-management-subsystems.level=warn
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.level=info
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.level=warn
+
+logger.alfresco-repo-security-sync.name=org.alfresco.repo.security.sync
+logger.alfresco-repo-security-sync.level=info
+
+logger.alfresco-repo-security-person.name=org.alfresco.repo.security.person
+logger.alfresco-repo-security-person.level=info
+
+logger.alfresco-sample.name=org.alfresco.sample
+logger.alfresco-sample.level=info
+
+logger.alfresco-web.name=org.alfresco.web
+logger.alfresco-web.level=info
+
+logger.alfresco-service-descriptor-DescriptorService.name=org.alfresco.service.descriptor.DescriptorService
+logger.alfresco-service-descriptor-DescriptorService.level=info
+
+logger.alfresco-repo-importer-ImporterBootstrap.name=org.alfresco.repo.importer.ImporterBootstrap
+logger.alfresco-repo-importer-ImporterBootstrap.level=error
+#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
+
+logger.alfresco-repo-admin-patch-PatchExecuter.name=org.alfresco.repo.admin.patch.PatchExecuter
+logger.alfresco-repo-admin-patch-PatchExecuter.level=info
+
+logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.name=org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl
+logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.level=info
+
+# Specific patches
+logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.name=org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch
+logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.level=info
+
+logger.alfresco-repo-version-VersionMigrator.name=org.alfresco.repo.version.VersionMigrator
+logger.alfresco-repo-version-VersionMigrator.level=info
+
+logger.alfresco-repo-module-ModuleServiceImpl.name=org.alfresco.repo.module.ModuleServiceImpl
+logger.alfresco-repo-module-ModuleServiceImpl.level=info
+
+logger.alfresco-repo-domain-schema-SchemaBootstrap.name=org.alfresco.repo.domain.schema.SchemaBootstrap
+logger.alfresco-repo-domain-schema-SchemaBootstrap.level=info
+
+logger.alfresco-repo-admin-ConfigurationChecker.name=org.alfresco.repo.admin.ConfigurationChecker
+logger.alfresco-repo-admin-ConfigurationChecker.level=info
+
+logger.alfresco-repo-node-index-AbstractReindexComponent.name=org.alfresco.repo.node.index.AbstractReindexComponent
+logger.alfresco-repo-node-index-AbstractReindexComponent.level=warn
+
+logger.alfresco-repo-node-index-IndexTransactionTracker.name=org.alfresco.repo.node.index.IndexTransactionTracker
+logger.alfresco-repo-node-index-IndexTransactionTracker.level=warn
+
+logger.alfresco-repo-node-index-FullIndexRecoveryComponent.name=org.alfresco.repo.node.index.FullIndexRecoveryComponent
+logger.alfresco-repo-node-index-FullIndexRecoveryComponent.level=info
+
+#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.name=org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl
+#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.level=warn
+
+logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.name=org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor
+logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.level=warn
+
+logger.alfresco-repo-transaction-RetryingTransactionHelper.name=org.alfresco.repo.transaction.RetryingTransactionHelper
+logger.alfresco-repo-transaction-RetryingTransactionHelper.level=warn
+
+logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.name=org.alfresco.util.transaction.SpringAwareUserTransaction.trace
+logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.level=warn
+
+logger.alfresco-util-AbstractTriggerBean.name=org.alfresco.util.AbstractTriggerBean
+logger.alfresco-util-AbstractTriggerBean.level=warn
+
+logger.alfresco-enterprise-repo-cluster.name=org.alfresco.enterprise.repo.cluster
+logger.alfresco-enterprise-repo-cluster.level=info
+
+logger.alfresco-repo-version-Version2ServiceImpl.name=org.alfresco.repo.version.Version2ServiceImpl
+logger.alfresco-repo-version-Version2ServiceImpl.level=warn
+
+#logger.alfresco-web-app-DebugPhaseListener.name=org.alfresco.web.app.DebugPhaseListener
+#logger.alfresco-web-app-DebugPhaseListener.level=debug
+
+logger.alfresco-repo-node-db-NodeStringLengthWorker.name=org.alfresco.repo.node.db.NodeStringLengthWorker
+logger.alfresco-repo-node-db-NodeStringLengthWorker.level=info
+
+logger.alfresco-repo-workflow.name=org.alfresco.repo.workflow
+logger.alfresco-repo-workflow.level=info
+
+# FTP server debugging
+logger.alfresco-ftp-protocol.name=org.alfresco.ftp.protocol
+logger.alfresco-ftp-protocol.level=error
+
+# WebDAV debugging
+logger.alfresco-webdav-protocol.name=org.alfresco.webdav.protocol
+logger.alfresco-webdav-protocol.level=info
+
+# NTLM servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
+
+# Kerberos servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
+
+# File servers
+logger.alfresco-fileserver.name=org.alfresco.fileserver
+logger.alfresco-fileserver.level=warn
+
+# Repo filesystem debug logging
+#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
+
+# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
+logger.alfresco-repo-node-integrity.name=org.alfresco.repo.node.integrity
+logger.alfresco-repo-node-integrity.level=error
+
+# Indexer debugging
+logger.alfresco-repo-search-Indexer.name=org.alfresco.repo.search.Indexer
+logger.alfresco-repo-search-Indexer.level=error
+
+logger.alfresco-repo-search-impl-lucene-index.name=org.alfresco.repo.search.impl.lucene.index
+logger.alfresco-repo-search-impl-lucene-index.level=error
+
+logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.name=org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl
+logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.level=warn
+
+# Audit debugging
+# log4j.logger.org.alfresco.repo.audit=DEBUG
+# log4j.logger.org.alfresco.repo.audit.model=DEBUG
+
+# Property sheet and modelling debugging
+# change to error to hide the warnings about missing properties and associations
+logger.missingProperties.name=alfresco.missingProperties
+logger.missingProperties.level=warn
+
+# Dictionary/Model debugging
+logger.alfresco-repo-dictionary.name=org.alfresco.repo.dictionary
+logger.alfresco-repo-dictionary.level=warn
+
+# Virtualization Server Registry
+logger.alfresco-mbeans-VirtServerRegistry.name=org.alfresco.mbeans.VirtServerRegistry
+logger.alfresco-mbeans-VirtServerRegistry.level=error
+
+# Spring context runtime property setter
+logger.alfresco-util-RuntimeSystemPropertiesSetter.name=org.alfresco.util.RuntimeSystemPropertiesSetter
+logger.alfresco-util-RuntimeSystemPropertiesSetter.level=info
+
+# Debugging options for clustering
+logger.alfresco-repo-content-ReplicatingContentStore.name=org.alfresco.repo.content.ReplicatingContentStore
+logger.alfresco-repo-content-ReplicatingContentStore.level=error
+
+logger.alfresco-repo-content-replication.name=org.alfresco.repo.content.replication
+logger.alfresco-repo-content-replication.level=error
+
+#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
+
+# Activity service
+logger.alfresco-repo-activities.name=org.alfresco.repo.activities
+logger.alfresco-repo-activities.level=warn
+
+# User usage tracking
+logger.alfresco-repo-usage.name=org.alfresco.repo.usage
+logger.alfresco-repo-usage.level=info
+
+# Sharepoint
+logger.alfresco-module-vti.name=org.alfresco.module.vti
+logger.alfresco-module-vti.level=info
+
+# Forms Engine
+logger.alfresco-web-config-forms.name=org.alfresco.web.config.forms
+logger.alfresco-web-config-forms.level=info
+
+logger.alfresco-web-scripts-forms.name=org.alfresco.web.scripts.forms
+logger.alfresco-web-scripts-forms.level=info
+
+# CMIS
+logger.alfresco-opencmis.name=org.alfresco.opencmis
+logger.alfresco-opencmis.level=error
+
+logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.name=org.alfresco.opencmis.AlfrescoCmisServiceInterceptor
+logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.level=error
+
+logger.alfresco-cmis.name=org.alfresco.cmis
+logger.alfresco-cmis.level=error
+
+logger.alfresco-cmis-dictionary.name=org.alfresco.cmis.dictionary
+logger.alfresco-cmis-dictionary.level=warn
+
+logger.apache-chemistry-opencmis.name=org.apache.chemistry.opencmis
+logger.apache-chemistry-opencmis.level=info
+
+logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.name=org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet
+logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.level=off
+
+logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.name=org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet
+logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.level=off
+
+# IMAP
+logger.alfresco-repo-imap.name=org.alfresco.repo.imap
+logger.alfresco-repo-imap.level=info
+
+# JBPM
+# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler
+logger.jbpm-graph-def-GraphElement.name=org.jbpm.graph.def.GraphElement
+logger.jbpm-graph-def-GraphElement.level=fatal
+
+# 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
+
+# Repository
+logger.alfresco-repo-web-scripts.name=org.alfresco.repo.web.scripts
+logger.alfresco-repo-web-scripts.level=warn
+
+logger.alfresco-repo-web-scripts-BaseWebScriptTest.name=org.alfresco.repo.web.scripts.BaseWebScriptTest
+logger.alfresco-repo-web-scripts-BaseWebScriptTest.level=info
+
+logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.name=org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger
+logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.level=off
+
+logger.alfresco-repo-jscript.name=org.alfresco.repo.jscript
+logger.alfresco-repo-jscript.level=error
+
+logger.alfresco-repo-jscript-ScriptLogger.name=org.alfresco.repo.jscript.ScriptLogger
+logger.alfresco-repo-jscript-ScriptLogger.level=warn
+
+logger.alfresco-repo-cmis-rest-CMISTest.name=org.alfresco.repo.cmis.rest.CMISTest
+logger.alfresco-repo-cmis-rest-CMISTest.level=info
+
+logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl
+logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.level=off
+
+logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptExecutorImpl
+logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.level=info
+
+logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.name=org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor
+logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.level=off
+
+logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.name=org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl
+logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.level=info
+
+# Bulk Filesystem Import Tool
+logger.alfresco-repo-bulkimport.name=org.alfresco.repo.bulkimport
+logger.alfresco-repo-bulkimport.level=warn
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+logger.runtime.name=freemarker.runtime
+logger.runtime.level=
+
+# Metadata extraction
+logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.name=org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter
+logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.level=warn
+
+# Reduces PDFont error level due to ALF-7105
+logger.apache-pdfbox-pdmodel-font-PDSimpleFont.name=org.apache.pdfbox.pdmodel.font.PDSimpleFont
+logger.apache-pdfbox-pdmodel-font-PDSimpleFont.level=fatal
+
+logger.apache-pdfbox-pdmodel-font-PDCIDFont.name=org.apache.pdfbox.pdmodel.font.PDCIDFont
+logger.apache-pdfbox-pdmodel-font-PDCIDFont.level=fatal
+
+# no index support
+logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.name=org.alfresco.repo.search.impl.noindex.NoIndexIndexer
+logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.level=fatal
+
+logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.name=org.alfresco.repo.search.impl.noindex.NoIndexSearchService
+logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.level=fatal
+
+# lucene index warnings
+logger.alfresco-repo-search-impl-lucene-index-IndexInfo.name=org.alfresco.repo.search.impl.lucene.index.IndexInfo
+logger.alfresco-repo-search-impl-lucene-index-IndexInfo.level=warn
+
+# Warn about RMI socket bind retries.
+logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.name=org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory
+logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.level=warn
+
+logger.alfresco-repo-usage-RepoUsageMonitor.name=org.alfresco.repo.usage.RepoUsageMonitor
+logger.alfresco-repo-usage-RepoUsageMonitor.level=info
+
+# Authorization
+logger.alfresco-enterprise-repo-authorization-AuthorizationService.name=org.alfresco.enterprise.repo.authorization.AuthorizationService
+logger.alfresco-enterprise-repo-authorization-AuthorizationService.level=info
+
+logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.name=org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor
+logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.level=warn
+
+#-----------------------------------------------------------------------
+# Platform module logging
+#-----------------------------------------------------------------------
+logger.platformsample-DemoComponent.name=${package}.platformsample.DemoComponent
+logger.platformsample-DemoComponent.level=debug
+logger.platformsample-HelloWorldWebScript.name=${package}.platformsample.HelloWorldWebScript
+logger.platformsample-HelloWorldWebScript.level=debug
+
+

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/hotswap-agent.properties

@@ -26,12 +26,12 @@ disabledPlugins=Hibernate,Spring
 #
 # Load web application resources (such as HTML, JSP, CSS, ...) from this directory prior to default processing.
 # Use this setting to set to serve resources from source directory directly (e.g. src/main/webapp).
-extraWebappContext=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-platform-jar/target/classes/META-INF/resources;
+extraWebappContext=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-platform/target/classes/META-INF/resources;
 
 # Load static web resources from different directory.
 #
 # This setting is dependent on application server plugin(Jetty, Tomcat, JBoss, ...)
-webappDir=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-platform-jar/target/classes/META-INF/resources;
+webappDir=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-platform/target/classes/META-INF/resources;
 
 # Watch for changes in a directory (resources only).
 #

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn"
-   xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
-   xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema"
-   expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
-
-   <process id="my-process">
-
-      <startEvent id="start" />
-      <sequenceFlow id="flow1" sourceRef="start" targetRef="someTask" />
-      
-      <userTask id="someTask" name="Activiti is awesome!" />
-      <sequenceFlow id="flow2" sourceRef="someTask" targetRef="end" />
-
-      <endEvent id="end" />
-
-   </process>
-
-</definitions>

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

@@ -3,8 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
     <name>Alfresco Platform/Repository JAR Module</name>
-    <description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.0
+    <description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.9</description>
-    </description>
     <packaging>jar</packaging>
 
     <parent>
@@ -17,7 +16,6 @@
     </properties>
 
     <dependencies>
-        <!-- Add here any JAR or AMP dependency that needs to be deployed to ACS -->
     </dependencies>
 
     <build>

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

@@ -10,7 +10,7 @@
     <platformModules>
         <moduleDependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>some-platform-jar</artifactId>
+            <artifactId>some-platform</artifactId>
             <version>${project.version}</version>
             <type>amp</type>
         </moduleDependency>
@@ -35,6 +35,11 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
+        <!-- Add module-specific log4j2.properties configuration at top level in the AMP -->
+        <file>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j2.properties</source>
+            <filtered>false</filtered>
+        </file>
     </files>
 
     <fileSets>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/web/README.md

@@ -10,7 +10,7 @@ any existing web resources in the Alfresco.WAR.
 `
 <moduleDependency>
     <groupId>${project.groupId}</groupId>
-    <artifactId>some-platform-jar</artifactId>
+    <artifactId>some-platform</artifactId>
     <version>${project.version}</version>
     <type>amp</type>
 </moduleDependency>

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

@@ -36,5 +36,10 @@
                 </props>
             </list>
         </property>
+        <property name="labels">
+            <list>
+                <value>alfresco/module/${project.artifactId}/messages/workflow-messages</value>
+            </list>
+        </property>
     </bean>
 </beans>

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

@@ -0,0 +1 @@
+# Add here module-specific custom log4j2.properties configuration

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

@@ -0,0 +1,5 @@
+#
+# Activiti My Process Workflow
+#
+my-process.workflow.title=My Process
+my-process.workflow.description=This is my custom process

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions
+        xmlns:activiti="http://activiti.org/bpmn"
+        xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" typeLanguage="http://www.w3.org/2001/XMLSchema"
+        expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
+
+   <process id="my-process">
+
+      <startEvent id="start" activiti:formKey="wf:submitAdhocTask"/>
+      <sequenceFlow id="flow1" sourceRef="start" targetRef="someTask"/>
+
+      <userTask id="someTask" name="Activiti is awesome!" activiti:formKey="wf:adhocTask">
+         <humanPerformer>
+            <resourceAssignmentExpression>
+               <formalExpression>${bpm_assignee.properties.userName}</formalExpression>
+            </resourceAssignmentExpression>
+         </humanPerformer>
+      </userTask>
+      <sequenceFlow id="flow2" sourceRef="someTask" targetRef="end"/>
+
+      <endEvent id="end"/>
+
+   </process>
+
+</definitions>

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

@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-share-jar</artifactId>
+            <artifactId>${rootArtifactId}-share</artifactId>
             <version>${version}</version>
         </dependency>
     </dependencies>
@@ -29,37 +29,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.0.2</version>
                 <executions>
-                    <!-- Copy the share extension -->
+                    <!-- Collect extensions (JARs or AMPs) declared in this module do be deployed to docker -->
                     <execution>
-                        <id>copy-repo-extension</id>
+                        <id>collect-extensions</id>
-                        <phase>pre-integration-test</phase>
+                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>${groupId}</groupId>
-                                    <artifactId>${rootArtifactId}-share-jar</artifactId>
-                                    <version>${version}</version>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/extensions</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <!-- Copy other dependencies (JARs or AMPs) declared in the share module -->
-                    <execution>
-                        <id>copy-third-party-dependencies</id>
-                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/extensions</outputDirectory>
                             <includeScope>runtime</includeScope>
+                            <!-- IMPORTANT: if using amp dependencies only, add <includeTypes>amp</includeTypes> -->
                         </configuration>
                     </execution>
                 </executions>
@@ -68,7 +49,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>copy-and-filter-docker-resources</id>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ${docker.share.image}:${alfresco.share.version}
+FROM ${docker.share.image}:${alfresco.share.docker.version}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
 
@@ -12,5 +12,5 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
 
 COPY share-config-custom.xml $TOMCAT_DIR/shared/classes/alfresco/web-extension
 
-COPY log4j.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
+COPY log4j2.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
-COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
+COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/hotswap-agent.properties

@@ -27,12 +27,12 @@ disabledPlugins=Hibernate,Spring
 #
 # Load web application resources (such as HTML, JSP, CSS, ...) from this directory prior to default processing.
 # Use this setting to set to serve resources from source directory directly (e.g. src/main/webapp).
-extraWebappContext=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-share-jar/target/classes/META-INF/resources;
+extraWebappContext=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-share/target/classes/META-INF/resources;
 
 # Load static web resources from different directory.
 #
 # This setting is dependent on application server plugin(Jetty, Tomcat, JBoss, ...)
-webappDir=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-share-jar/target/classes/META-INF/resources;
+webappDir=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-share/target/classes/META-INF/resources;
 
 # Watch for changes in a directory (resources only).
 #

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/log4j.properties

@@ -1,57 +0,0 @@
-#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=warn
-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...
-#-----------------------------------------------------------------------
-
-
-

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/log4j2.properties

@@ -0,0 +1,89 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Set root logger level to error
+#log4j.rootLogger=error, Console, File
+rootLogger.level=error
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+# Console appender definition #
+
+# 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
+
+# use log4j NDC to replace %x with tenant domain / username
+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=alfresco.log
+appender.rolling.filePattern=alfresco.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...
+#-----------------------------------------------------------------------
+
+
+

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/share-config-custom.xml

@@ -39,7 +39,7 @@
 
     <!--
         Disable CSRF completely for now
-        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
+        It seems Share has issues on 4.x with the embedded tomcat and CSRFPolicy
         -->
     <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
         <filter/>

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

@@ -5,7 +5,7 @@
     <artifactId>${artifactId}</artifactId>
     <name>Alfresco Share JAR Module</name>
     <packaging>jar</packaging>
-    <description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.0</description>
+    <description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.9</description>
 
     <parent>
         <groupId>${groupId}</groupId>
@@ -25,7 +25,6 @@
             <artifactId>share</artifactId>
             <classifier>classes</classifier>
         </dependency>
-        <!-- Add here any JAR or AMP dependency that needs to be deployed to share -->
     </dependencies>
 
     <build>

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

@@ -10,7 +10,7 @@
     <shareModules>
         <moduleDependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>some-share-jar</artifactId>
+            <artifactId>some-share</artifactId>
             <version>${project.version}</version>
             <type>amp</type>
         </moduleDependency>
@@ -35,6 +35,11 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
+        <!-- Add module-specific log4j2.properties configuration at top level in the AMP -->
+        <file>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j2.properties</source>
+            <filtered>false</filtered>
+        </file>
     </files>
 
     <fileSets>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/web/README.md

@@ -10,7 +10,7 @@ any existing web resources in the Share.WAR.
 `
 <moduleDependency>
     <groupId>${project.groupId}</groupId>
-    <artifactId>some-share-jar</artifactId>
+    <artifactId>some-share</artifactId>
     <version>${project.version}</version>
     <type>amp</type>
 </moduleDependency>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/module/__artifactId__/log4j2.properties

@@ -0,0 +1 @@
+# Add here module-specific custom log4j2.properties configuration

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       dockerfile: ./Dockerfile
       context: ../../../${rootArtifactId}-share-docker/target
     environment:
-      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
+      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
       REPO_HOST: ${rootArtifactId}-acs
       REPO_PORT: 8080
     ports:
@@ -19,7 +19,13 @@ services:
       dockerfile: ./Dockerfile
       context: ../../../${rootArtifactId}-platform-docker/target
     environment:
-      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
+      JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
+      JAVA_OPTS: "
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
+        -Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"
+        "
+      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
     ports:
       - "${symbol_dollar}{acs.port}:8080"
       - "${symbol_dollar}{acs.debug.port}:8888"
@@ -33,27 +39,39 @@ services:
       POSTGRES_DB: alfresco
       POSTGRES_USER: alfresco
       POSTGRES_PASSWORD: alfresco
+    command: postgres -c max_connections=300 -c log_min_messages=LOG
     ports:
       - "${symbol_dollar}{postgres.port}:5432"
     volumes:
       - ${rootArtifactId}-db-volume:/var/lib/postgresql/data
   ${rootArtifactId}-ass:
-    image: alfresco/alfresco-search-services:1.2.0
+    image: alfresco/alfresco-search-services:2.0.3
     environment:
       SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
       SOLR_ALFRESCO_PORT: 8080
       SOLR_SOLR_HOST: ${rootArtifactId}-ass
       SOLR_SOLR_PORT: 8983
       SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
     ports:
       - "8983:8983"
     volumes:
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
+  ${rootArtifactId}-activemq:
+      image: alfresco/alfresco-activemq:5.16.1
+      mem_limit: 1g
+      ports:
+        - 8161:8161 # Web Console
+        - 5672:5672 # AMQP
+        - 61616:61616 # OpenWire
+        - 61613:61613 # STOMP
+
 volumes:
   ${rootArtifactId}-acs-volume:
     external: true
   ${rootArtifactId}-db-volume:
     external: true
   ${rootArtifactId}-ass-volume:
-    external: true
+    external: true

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

@@ -5,10 +5,14 @@
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-    <name>AIO - SDK 4.0</name>
+    <name>AIO - SDK 4.9</name>
-    <description>All-In-One (AIO) project for SDK 4.0</description>
+    <description>All-In-One (AIO) project for SDK 4.9</description>
     <packaging>pom</packaging>
 
+    <prerequisites>
+        <maven>3.3.0</maven>
+    </prerequisites>
+
     <properties>
         <!-- Alfresco Maven Plugin version to use -->
         <alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version>
@@ -19,18 +23,18 @@
         <alfresco.groupId>org.alfresco</alfresco.groupId>
         <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
         <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
+        <alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
         <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
+        <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
 
         <!-- Docker images -->
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
         <docker.share.image>@@alfresco.share.docker.image@@</docker.share.image>
 
-        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
+        <keystore.settings>@@keystore.settings@@</keystore.settings>
-        <jrebel.version>1.1.6</jrebel.version>
 
-        <!-- Compile with Java 8, default is 5 -->
+        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <jrebel.version>1.1.8</jrebel.version>
-        <maven.compiler.target>1.8</maven.compiler.target>
 
         <!-- Environment configuration properties -->
         <share.port>8180</share.port>
@@ -51,19 +55,17 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
-            <version>1.9.5</version>
+            <version>4.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -81,6 +83,7 @@
             <version>${alfresco.sdk.version}</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <dependencyManagement>
@@ -167,7 +170,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.1.0</version>
                     <configuration>
                         <encoding>UTF-8</encoding>
                         <nonFilteredFileExtensions> <!-- jpg, jpeg, gif, bmp and png are added automatically -->
@@ -198,6 +201,53 @@
                         </nonFilteredFileExtensions>
                     </configuration>
                 </plugin>
+
+                <plugin>
+                    <groupId>org.zeroturnaround</groupId>
+                    <artifactId>jrebel-maven-plugin</artifactId>
+                    <version>${jrebel.version}</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>3.0.0-M1</version>
+                    <executions>
+                        <execution>
+                            <id>integration-test</id>
+                            <phase>integration-test</phase>
+                            <goals>
+                                <goal>integration-test</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>verify-test</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>verify</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.surefire</groupId>
+                            <artifactId>surefire-junit47</artifactId>
+                            <version>3.0.0-M1</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -209,14 +259,12 @@
             </resource>
         </resources>
 
-
         <plugins>
             <!-- Filter the test resource files in the AIO parent project, and do property substitutions.
                  We need this config so this is done before the Alfresco Maven Plugin 'run' is executed. -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.1</version>
                 <inherited>false</inherited>
                 <!-- Run only for the AIO parent Project -->
                 <executions>
@@ -239,11 +287,74 @@
                 </executions>
             </plugin>
 
+            <!-- Compress JavaScript files and store as *.min.js -->
+            <plugin>
+                <groupId>com.github.blutorange</groupId>
+                <artifactId>closure-compiler-maven-plugin</artifactId>
+                <version>2.28.0</version>
+                <executions>
+                    <!-- Compress the JS files under the assembly folder -->
+                    <execution>
+                        <id>compress-assembly</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>minify</goal>
+                        </goals>
+                        <configuration>
+                            <baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
+                            <baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
+                            <sourceDir>web</sourceDir>
+                            <targetDir>web</targetDir>
+                            <skipMerge>true</skipMerge>
+                            <includes>
+                                <include>**/*.js</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/webscripts/**</exclude>
+                                <exclude>**/site-webscripts/**</exclude>
+                                <exclude>**/META-INF/**</exclude>
+                                <exclude>**/*.lib.js</exclude>
+                                <exclude>**/*.css</exclude>
+                                <exclude>**/*.min.js</exclude>
+                                <exclude>**/*.min.css</exclude>
+                            </excludes>
+                            <force>true</force>
+                        </configuration>
+                    </execution>
+                    <!-- Compress the JS files under the resources folder -->
+                    <execution>
+                        <id>compress-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>minify</goal>
+                        </goals>
+                        <configuration>
+                            <baseSourceDir>${project.basedir}/src/main</baseSourceDir>
+                            <baseTargetDir>${project.basedir}/src/main</baseTargetDir>
+                            <sourceDir>resources</sourceDir>
+                            <targetDir>resources</targetDir>
+                            <skipMerge>true</skipMerge>
+                            <includes>
+                                <include>**/*.js</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/webscripts/**</exclude>
+                                <exclude>**/site-webscripts/**</exclude>
+                                <exclude>**/*.lib.js</exclude>
+                                <exclude>**/*.css</exclude>
+                                <exclude>**/*.min.js</exclude>
+                                <exclude>**/*.min.css</exclude>
+                            </excludes>
+                            <force>true</force>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- Hot reloading with JRebel -->
             <plugin>
                 <groupId>org.zeroturnaround</groupId>
                 <artifactId>jrebel-maven-plugin</artifactId>
-                <version>${jrebel.version}</version>
                 <executions>
                     <execution>
                         <id>generate-rebel-xml</id>
@@ -277,6 +388,64 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>java8</id>
+            <activation>
+                <jdk>[1.8,11.0)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.0</version>
+                        <configuration>
+                            <source>1.8</source>
+                            <target>1.8</target>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>java11</id>
+            <activation>
+                <jdk>[11.0,17)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.0</version>
+                        <configuration>
+                            <release>11</release>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>java17</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.0</version>
+                        <configuration>
+                            <release>17</release>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <!--
         Alfresco Maven Repositories
         -->
@@ -298,6 +467,10 @@
             <id>alfresco-private-repository</id>
             <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
         </repository>
+        <repository>
+            <id>alfresco-internal</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>

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

@@ -12,7 +12,7 @@ IF NOT [%M2_HOME%]==[] (
 )
 
 IF [%1]==[] (
-    echo "Usage: %0 {build_start|start|stop|purge|tail|reload_share|reload_acs|build_test|test}"
+    echo "Usage: %0 {build_start|build_start_it_supported|start|stop|purge|tail|reload_share|reload_acs|build_test|test}"
     GOTO END
 )
 
@@ -23,6 +23,14 @@ IF %1==build_start (
     CALL :tail
     GOTO END
 )
+IF %1==build_start_it_supported (
+    CALL :down
+    CALL :build
+    CALL :prepare-test
+    CALL :start
+    CALL :tail
+    GOTO END
+)
 IF %1==start (
     CALL :start
     CALL :tail
@@ -56,6 +64,7 @@ IF %1==reload_acs (
 IF %1==build_test (
     CALL :down
     CALL :build
+    CALL :prepare-test
     CALL :start
     CALL :test
     CALL :tail_all
@@ -74,45 +83,46 @@ EXIT /B %ERRORLEVEL%
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
 EXIT /B 0
 :start_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
 EXIT /B 0
 :start_acs
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs
 EXIT /B 0
 :down
-    docker-compose -f "%COMPOSE_FILE_PATH%" down
+    if exist "%COMPOSE_FILE_PATH%" (
+        docker compose -f "%COMPOSE_FILE_PATH%" down
+    )
 EXIT /B 0
 :build
-    docker rmi alfresco-content-services-${rootArtifactId}:development
+	call %MVN_EXEC% clean package
-    docker rmi alfresco-share-${rootArtifactId}:development
-	call %MVN_EXEC% clean install -DskipTests
 EXIT /B 0
 :build_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
-    docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
-    docker rmi alfresco-share-${rootArtifactId}:development
+	call %MVN_EXEC% clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
-	call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-share-jar
 EXIT /B 0
 :build_acs
-    docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
+    docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
-    docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs
+    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs
-    docker rmi alfresco-content-services-${rootArtifactId}:development
+	call %MVN_EXEC% clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
-	call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-platform-jar
 EXIT /B 0
 :tail
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
+    docker compose -f "%COMPOSE_FILE_PATH%" logs -f
 EXIT /B 0
 :tail_all
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+EXIT /B 0
+:prepare-test
+    call %MVN_EXEC% verify -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests,${rootArtifactId}-platform-docker
 EXIT /B 0
 :test
-    call %MVN_EXEC% verify -pl integration-tests
+    call %MVN_EXEC% verify -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests
 EXIT /B 0
 :purge
-    docker volume rm ${rootArtifactId}-acs-volume
+    docker volume rm -f ${rootArtifactId}-acs-volume
-    docker volume rm ${rootArtifactId}-db-volume
+    docker volume rm -f ${rootArtifactId}-db-volume
-    docker volume rm ${rootArtifactId}-ass-volume
+    docker volume rm -f ${rootArtifactId}-ass-volume
 EXIT /B 0

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

@@ -1,7 +1,7 @@
 #set( $symbol_dollar = '$' )
 #!/bin/sh
 
-export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml
+export COMPOSE_FILE_PATH="${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml"
 
 if [ -z "${symbol_dollar}{M2_HOME}" ]; then
   export MVN_EXEC="mvn"
@@ -13,57 +13,59 @@ start() {
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
 }
 
 start_share() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
 }
 
 start_acs() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d ${rootArtifactId}-acs
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs
 }
 
 down() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down
+    if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
+        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
+    fi
 }
 
 purge() {
-    docker volume rm ${rootArtifactId}-acs-volume
+    docker volume rm -f ${rootArtifactId}-acs-volume
-    docker volume rm ${rootArtifactId}-db-volume
+    docker volume rm -f ${rootArtifactId}-db-volume
-    docker volume rm ${rootArtifactId}-ass-volume
+    docker volume rm -f ${rootArtifactId}-ass-volume
 }
 
 build() {
-    docker rmi alfresco-content-services-${rootArtifactId}:development
+    ${symbol_dollar}MVN_EXEC clean package
-    docker rmi alfresco-share-${rootArtifactId}:development
-    ${symbol_dollar}MVN_EXEC clean install -DskipTests=true
 }
 
 build_share() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
-    yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-share
+    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
-    docker rmi alfresco-share-${rootArtifactId}:development
+    ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
-    ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-share-jar
 }
 
 build_acs() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-acs
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-acs
-    yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-acs
+    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-acs
-    docker rmi alfresco-content-services-${rootArtifactId}:development
+    ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
-    ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-platform-jar
 }
 
 tail() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs -f
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
 }
 
 tail_all() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs --tail="all"
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
+}
+
+prepare_test() {
+    ${symbol_dollar}MVN_EXEC verify -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests,${rootArtifactId}-platform-docker
 }
 
 test() {
-    ${symbol_dollar}MVN_EXEC verify -pl integration-tests
+    ${symbol_dollar}MVN_EXEC verify -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests
 }
 
 case "${symbol_dollar}1" in
@@ -73,6 +75,13 @@ case "${symbol_dollar}1" in
     start
     tail
     ;;
+  build_start_it_supported)
+    down
+    build
+    prepare_test
+    start
+    tail
+    ;;
   start)
     start
     tail
@@ -100,6 +109,7 @@ case "${symbol_dollar}1" in
   build_test)
     down
     build
+    prepare_test
     start
     test
     tail_all
@@ -109,5 +119,5 @@ case "${symbol_dollar}1" in
     test
     ;;
   *)
-    echo "Usage: ${symbol_dollar}0 {build_start|start|stop|purge|tail|reload_share|reload_acs|build_test|test}"
+    echo "Usage: ${symbol_dollar}0 {build_start|build_start_it_supported|start|stop|purge|tail|reload_share|reload_acs|build_test|test}"
 esac

archetypes/alfresco-platform-jar-archetype/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.0.0-beta-1</version>
+    <version>5.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -49,6 +49,7 @@
                 <delimiters>
                     <delimiter>@@</delimiter>
                 </delimiters>
+                <addDefaultExcludes>false</addDefaultExcludes>
             </configuration>
         </plugin>
       </plugins>

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

@@ -23,12 +23,6 @@
                 <include>**</include>
             </includes>
         </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-            <directory>src/main/docker/license</directory>
-            <includes>
-                <include>**</include>
-            </includes>
-        </fileSet>
         <fileSet encoding="UTF-8" filtered="false">
             <directory>src/main/docker</directory>
             <includes>
@@ -81,6 +75,7 @@
         <fileSet encoding="UTF-8" filtered="true">
             <directory></directory>
             <includes>
+                <include>.gitignore</include>
                 <include>run.sh</include>
                 <include>run.bat</include>
                 <include>README.md</include>

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/.gitignore

@@ -0,0 +1,38 @@
+**.log*
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+# Eclipse
+.metadata
+.project
+.classpath
+bin/
+tmp/
+*.tmp
+.settings/
+.loadpath
+.recommenders
+
+# IntelliJ IDEA
+**.idea
+**.iml
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# macOS
+*.DS_Store

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md

@@ -1,6 +1,6 @@
-# Alfresco ACS JAR Module - SDK 4.0
+# Alfresco ACS JAR Module - SDK 4.9
 
-This is an ACS project for Alfresco SDK 4.0.
+This is an ACS project for Alfresco SDK 4.9.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 
@@ -14,6 +14,8 @@ All the services of the project are now run as docker containers. The run script
 
  * `build_start`. Build the whole project, recreate the ACS docker image, start the dockerised environment composed by ACS, Share (optional), ASS 
  and PostgreSQL and tail the logs of all the containers.
+ * `build_start_it_supported`. Build the whole project including dependencies required for IT execution, recreate the ACS docker image, start the dockerised environment 
+ composed by ACS, Share (optional), ASS and PostgreSQL and tail the logs of all the containers.
  * `start`. Start the dockerised environment without building the project and tail the logs of all the containers.
  * `stop`. Stop the dockerised environment.
  * `purge`. Stop the dockerised container and delete all the persistent data (docker volumes).

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

@@ -15,7 +15,13 @@ services:
       dockerfile: ./Dockerfile
       context: ../../../target
     environment:
-      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
+      JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
+      JAVA_OPTS: "
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
+        -Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"
+        "
+      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
     ports:
       - "${symbol_dollar}{acs.port}:8080"
       - "${symbol_dollar}{acs.debug.port}:8888"
@@ -29,27 +35,39 @@ services:
       POSTGRES_DB: alfresco
       POSTGRES_USER: alfresco
       POSTGRES_PASSWORD: alfresco
+    command: postgres -c max_connections=300 -c log_min_messages=LOG
     ports:
       - "${symbol_dollar}{postgres.port}:5432"
     volumes:
       - ${rootArtifactId}-db-volume:/var/lib/postgresql/data
   ${rootArtifactId}-ass:
-    image: alfresco/alfresco-search-services:1.2.0
+    image: alfresco/alfresco-search-services:2.0.3
     environment:
       SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
       SOLR_ALFRESCO_PORT: 8080
       SOLR_SOLR_HOST: ${rootArtifactId}-ass
       SOLR_SOLR_PORT: 8983
       SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
     ports:
       - "8983:8983"
     volumes:
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
+  ${rootArtifactId}-activemq:
+      image: alfresco/alfresco-activemq:5.16.1
+      mem_limit: 1g
+      ports:
+        - 8161:8161 # Web Console
+        - 5672:5672 # AMQP
+        - 61616:61616 # OpenWire
+        - 61613:61613 # STOMP
+
 volumes:
   ${rootArtifactId}-acs-volume:
     external: true
   ${rootArtifactId}-db-volume:
     external: true
   ${rootArtifactId}-ass-volume:
-    external: true
+    external: true

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat

@@ -12,7 +12,7 @@ IF NOT [%M2_HOME%]==[] (
 )
 
 IF [%1]==[] (
-    echo "Usage: %0 {build_start|start|stop|purge|tail|build_test|test}"
+    echo "Usage: %0 {build_start|build_start_it_supported|start|stop|purge|tail|build_test|test}"
     GOTO END
 )
 
@@ -23,6 +23,14 @@ IF %1==build_start (
     CALL :tail
     GOTO END
 )
+IF %1==build_start_it_supported (
+    CALL :down
+    CALL :build
+    CALL :prepare_test
+    CALL :start
+    CALL :tail
+    GOTO END
+)
 IF %1==start (
     CALL :start
     CALL :tail
@@ -44,6 +52,7 @@ IF %1==tail (
 IF %1==build_test (
     CALL :down
     CALL :build
+    CALL :prepare_test
     CALL :start
     CALL :test
     CALL :tail_all
@@ -62,26 +71,30 @@ EXIT /B %ERRORLEVEL%
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
 EXIT /B 0
 :down
-    docker-compose -f "%COMPOSE_FILE_PATH%" down
+    if exist "%COMPOSE_FILE_PATH%" (
+        docker compose -f "%COMPOSE_FILE_PATH%" down
+    )
 EXIT /B 0
 :build
-    docker rmi alfresco-content-services-${rootArtifactId}:development
+	call %MVN_EXEC% clean package
-	call %MVN_EXEC% clean install -DskipTests
 EXIT /B 0
 :tail
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
+    docker compose -f "%COMPOSE_FILE_PATH%" logs -f
 EXIT /B 0
 :tail_all
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+EXIT /B 0
+:prepare_test
+    call %MVN_EXEC% verify -DskipTests=true
 EXIT /B 0
 :test
     call %MVN_EXEC% verify
 EXIT /B 0
 :purge
-    docker volume rm ${rootArtifactId}-acs-volume
+    docker volume rm -f ${rootArtifactId}-acs-volume
-    docker volume rm ${rootArtifactId}-db-volume
+    docker volume rm -f ${rootArtifactId}-db-volume
-    docker volume rm ${rootArtifactId}-ass-volume
+    docker volume rm -f ${rootArtifactId}-ass-volume
 EXIT /B 0

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh

@@ -1,7 +1,7 @@
 #set( $symbol_dollar = '$' )
 #!/bin/sh
 
-export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml
+export COMPOSE_FILE_PATH="${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml"
 
 if [ -z "${symbol_dollar}{M2_HOME}" ]; then
   export MVN_EXEC="mvn"
@@ -13,30 +13,35 @@ start() {
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
 }
 
 down() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down
+    if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
+        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
+    fi
 }
 
 purge() {
-    docker volume rm ${rootArtifactId}-acs-volume
+    docker volume rm -f ${rootArtifactId}-acs-volume
-    docker volume rm ${rootArtifactId}-db-volume
+    docker volume rm -f ${rootArtifactId}-db-volume
-    docker volume rm ${rootArtifactId}-ass-volume
+    docker volume rm -f ${rootArtifactId}-ass-volume
 }
 
 build() {
-    docker rmi alfresco-content-services-${rootArtifactId}:development
+    ${symbol_dollar}MVN_EXEC clean package
-    ${symbol_dollar}MVN_EXEC clean install -DskipTests=true
 }
 
 tail() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs -f
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
 }
 
 tail_all() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs --tail="all"
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
+}
+
+prepare_test() {
+    ${symbol_dollar}MVN_EXEC verify -DskipTests=true
 }
 
 test() {
@@ -50,6 +55,13 @@ case "${symbol_dollar}1" in
     start
     tail
     ;;
+  build_start_it_supported)
+    down
+    build
+    prepare_test
+    start
+    tail
+    ;;
   start)
     start
     tail
@@ -67,6 +79,7 @@ case "${symbol_dollar}1" in
   build_test)
     down
     build
+    prepare_test
     start
     test
     tail_all
@@ -76,5 +89,5 @@ case "${symbol_dollar}1" in
     test
     ;;
   *)
-    echo "Usage: ${symbol_dollar}0 {build_start|start|stop|purge|tail|build_test|test}"
+    echo "Usage: ${symbol_dollar}0 {build_start|build_start_it_supported|start|stop|purge|tail|build_test|test}"
 esac

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

@@ -35,6 +35,11 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
+        <!-- Add module-specific log4j2.properties configuration at top level in the AMP -->
+        <file>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j2.properties</source>
+            <filtered>false</filtered>
+        </file>
     </files>
 
     <fileSets>

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile

@@ -1,6 +1,9 @@
 FROM ${docker.acs.image}:${alfresco.platform.version}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=${alfresco.platform.docker.user}
+
+USER root
 
 # Copy Dockerfile to avoid an error if no JARs exist
 COPY Dockerfile extensions/*.jar $TOMCAT_DIR/webapps/alfresco/WEB-INF/lib/
@@ -11,8 +14,10 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
               $TOMCAT_DIR/amps $TOMCAT_DIR/webapps/alfresco -directory -nobackup -force
 
 COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global.properties
-COPY dev-log4j.properties $TOMCAT_DIR/shared/classes/alfresco/extension
+COPY dev-log4j2.properties $TOMCAT_DIR/shared/classes/alfresco/extension
 COPY disable-webscript-caching-context.xml $TOMCAT_DIR/shared/classes/alfresco/extension
 
 # Copy Dockerfile to avoid an error if no license file exists
-COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/
+COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/
+
+USER ${USERNAME}

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties

@@ -62,7 +62,8 @@ db.driver=org.postgresql.Driver
 index.subsystem.name=solr6
 solr.host=${rootArtifactId}-ass
 solr.port=8983
-solr.secureComms=none
+solr.secureComms=secret
+solr.sharedSecret=secret
 
 db.username=alfresco
 db.password=alfresco
@@ -76,4 +77,12 @@ db.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
 cifs.enabled=false
 ftp.enabled=false
 
-csrf.filter.enabled=false
+csrf.filter.enabled=false
+
+# Embedded broker without persistence
+messaging.broker.url=vm://localhost?broker.persistent=false
+
+# Disable ATS
+transform.service.enabled=false
+local.transform.service.enabled=false
+legacy.transform.service.enabled=false

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/dev-log4j.properties

@@ -1,270 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Set root logger level to error
-log4j.rootLogger=error, Console, File
-
-
-# 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
-
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=alfresco.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
-
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
-log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-log4j.logger.org.hibernate.type=warn
-log4j.logger.org.hibernate.cfg.SettingsFactory=warn
-
-# 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
-
-# Axis/WSS4J
-log4j.logger.org.apache.axis=info
-log4j.logger.org.apache.ws=info
-
-# CXF
-log4j.logger.org.apache.cxf=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
-
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
-# log prepared statement cache activity log4j.logger.org.hibernate.ps.PreparedStatementCache=info
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.repo.admin=info
-log4j.logger.org.alfresco.repo.transaction=warn
-log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
-log4j.logger.org.alfresco.repo.model.filefolder=warn
-log4j.logger.org.alfresco.repo.tenant=info
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
-log4j.logger.org.alfresco.repo.management.subsystems=warn
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
-log4j.logger.org.alfresco.repo.security.sync=info
-log4j.logger.org.alfresco.repo.security.person=info
-
-log4j.logger.org.alfresco.sample=info
-log4j.logger.org.alfresco.web=info
-#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-#log4j.logger.org.alfresco.web.bean.clipboard=debug
-log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-#log4j.logger.org.alfresco.web.page=debug
-
-log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
-
-log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
-log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
-
-# Specific patches
-log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
-log4j.logger.org.alfresco.repo.version.VersionMigrator=info
-
-log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
-log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
-log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
-log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
-log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
-log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
-log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
-log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
-log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
-log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
-log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
-log4j.logger.org.alfresco.enterprise.repo.cluster=info
-log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
-
-#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-log4j.logger.org.alfresco.repo.node.db.NodeStringLengthWorker=info
-
-log4j.logger.org.alfresco.repo.workflow=info
-
-# CIFS server debugging
-log4j.logger.org.alfresco.smb.protocol=error
-#log4j.logger.org.alfresco.smb.protocol.auth=debug
-#log4j.logger.org.alfresco.acegi=debug
-
-# FTP server debugging
-log4j.logger.org.alfresco.ftp.protocol=error
-#log4j.logger.org.alfresco.ftp.server=debug
-
-# WebDAV debugging
-#log4j.logger.org.alfresco.webdav.protocol=debug
-log4j.logger.org.alfresco.webdav.protocol=info
-
-# NTLM servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
-
-# Kerberos servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
-
-# File servers
-log4j.logger.org.alfresco.fileserver=warn
-
-# Repo filesystem debug logging
-#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-log4j.logger.org.alfresco.repo.node.integrity=ERROR
-
-# Indexer debugging
-log4j.logger.org.alfresco.repo.search.Indexer=error
-#log4j.logger.org.alfresco.repo.search.Indexer=debug
-
-log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
-#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
-
-# Audit debugging
-# log4j.logger.org.alfresco.repo.audit=DEBUG
-# log4j.logger.org.alfresco.repo.audit.model=DEBUG
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-log4j.logger.alfresco.missingProperties=warn
-
-# Dictionary/Model debugging
-log4j.logger.org.alfresco.repo.dictionary=warn
-log4j.logger.org.alfresco.repo.dictionary.types.period=warn
-
-# Virtualization Server Registry
-log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
-
-# Spring context runtime property setter
-log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
-
-# Debugging options for clustering
-log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
-log4j.logger.org.alfresco.repo.content.replication=error
-
-#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
-
-# Activity service
-log4j.logger.org.alfresco.repo.activities=warn
-
-# User usage tracking
-log4j.logger.org.alfresco.repo.usage=info
-
-# Sharepoint
-log4j.logger.org.alfresco.module.vti=info
-
-# Forms Engine
-log4j.logger.org.alfresco.web.config.forms=info
-log4j.logger.org.alfresco.web.scripts.forms=info
-
-# CMIS
-log4j.logger.org.alfresco.opencmis=error
-log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
-log4j.logger.org.alfresco.cmis=error
-log4j.logger.org.alfresco.cmis.dictionary=warn
-log4j.logger.org.apache.chemistry.opencmis=info
-log4j.logger.org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet=OFF
-log4j.logger.org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet=OFF
-
-# IMAP
-log4j.logger.org.alfresco.repo.imap=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
-log4j.logger.org.jbpm.graph.def.GraphElement=fatal
-
-#log4j.logger.org.alfresco.repo.googledocs=debug
-
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Repository
-log4j.logger.org.alfresco.repo.web.scripts=warn
-log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
-log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
-log4j.logger.org.alfresco.repo.jscript=error
-log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
-log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
-
-log4j.logger.org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl=off
-log4j.logger.org.alfresco.repo.domain.schema.script.ScriptExecutorImpl=info
-
-log4j.logger.org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl=info
-
-# Bulk Filesystem Import Tool
-log4j.logger.org.alfresco.repo.bulkimport=warn
-
-# 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=
-
-# Metadata extraction
-log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
-
-# Reduces PDFont error level due to ALF-7105
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
-
-# no index support
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
-
-# lucene index warnings
-log4j.logger.org.alfresco.repo.search.impl.lucene.index.IndexInfo=warn
-
-# Warn about RMI socket bind retries.
-log4j.logger.org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory=warn
-
-log4j.logger.org.alfresco.repo.usage.RepoUsageMonitor=info
-
-# Authorization
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationService=info
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor=warn
-
-#-----------------------------------------------------------------------
-# Platform module logging
-#-----------------------------------------------------------------------
-log4j.logger.${package}.platformsample.DemoComponent=debug
-log4j.logger.${package}.platformsample.HelloWorldWebScript=debug
-
-
-

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/dev-log4j2.properties

@@ -0,0 +1,426 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Set root logger level to error
+#log4j.rootLogger=error, Console, File
+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
+
+# use log4j NDC to replace %x with tenant domain / username
+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=alfresco.log
+appender.rolling.filePattern=alfresco.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
+
+# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
+# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
+# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
+# Log4j addLoggerMBean as long as the logger exists and has been loaded.
+
+# Hibernate
+logger.hibernate.name=org.hibernate
+logger.hibernate.level=error
+
+logger.hibernate-util-JDBCExceptionReporter.name=org.hibernate.util.JDBCExceptionReporter
+logger.hibernate-util-JDBCExceptionReporter.level=fatal
+
+logger.hibernate-event-def-AbstractFlushingEventListener.name=org.hibernate.event.def.AbstractFlushingEventListener
+logger.hibernate-event-def-AbstractFlushingEventListener.level=fatal
+
+logger.hibernate-type.name=org.hibernate.type
+logger.hibernate-type.level=warn
+
+logger.hibernate-cfg-SettingsFactory.name=org.hibernate.cfg.SettingsFactory
+logger.hibernate-cfg-SettingsFactory.level=warn
+
+# 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
+
+# Axis/WSS4J
+logger.apache-axis.name=org.apache.axis
+logger.apache-axis.level=info
+
+logger.apache-ws.name=org.apache.ws
+logger.apache-ws.level=info
+
+# CXF
+logger.apache-cxf.name=org.apache.cxf
+logger.apache-cxf.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
+
+# OpenOfficeConnection
+logger.sf-jooreports-openoffice-connection.name=net.sf.jooreports.openoffice.connection
+logger.sf-jooreports-openoffice-connection.level=fatal
+
+# log prepared statement cache activity log4j.logger.org.hibernate.ps.PreparedStatementCache=info
+
+# Alfresco
+logger.alfresco.name=org.alfresco
+logger.alfresco.level=error
+
+logger.alfresco-repo-admin.name=org.alfresco.repo.admin
+logger.alfresco-repo-admin.level=info
+
+logger.alfresco-repo-transaction.name=org.alfresco.repo.transaction
+logger.alfresco-repo-transaction.level=warn
+
+logger.alfresco-repo-cache-TransactionalCache.name=org.alfresco.repo.cache.TransactionalCache
+logger.alfresco-repo-cache-TransactionalCache.level=warn
+
+logger.alfresco-repo-model-filefolder.name=org.alfresco.repo.model.filefolder
+logger.alfresco-repo-model-filefolder.level=warn
+
+logger.alfresco-repo-tenant.name=org.alfresco.repo.tenant
+logger.alfresco-repo-tenant.level=info
+
+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-config-JBossEnabledWebApplicationContext.name=org.alfresco.config.JBossEnabledWebApplicationContext
+logger.alfresco-config-JBossEnabledWebApplicationContext.level=warn
+
+logger.alfresco-repo-management-subsystems.name=org.alfresco.repo.management.subsystems
+logger.alfresco-repo-management-subsystems.level=warn
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.level=info
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.level=warn
+
+logger.alfresco-repo-security-sync.name=org.alfresco.repo.security.sync
+logger.alfresco-repo-security-sync.level=info
+
+logger.alfresco-repo-security-person.name=org.alfresco.repo.security.person
+logger.alfresco-repo-security-person.level=info
+
+logger.alfresco-sample.name=org.alfresco.sample
+logger.alfresco-sample.level=info
+
+logger.alfresco-web.name=org.alfresco.web
+logger.alfresco-web.level=info
+
+logger.alfresco-service-descriptor-DescriptorService.name=org.alfresco.service.descriptor.DescriptorService
+logger.alfresco-service-descriptor-DescriptorService.level=info
+
+logger.alfresco-repo-importer-ImporterBootstrap.name=org.alfresco.repo.importer.ImporterBootstrap
+logger.alfresco-repo-importer-ImporterBootstrap.level=error
+
+logger.alfresco-repo-admin-patch-PatchExecuter.name=org.alfresco.repo.admin.patch.PatchExecuter
+logger.alfresco-repo-admin-patch-PatchExecuter.level=info
+
+logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.name=org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl
+logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.level=info
+
+# Specific patches
+logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.name=org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch
+logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.level=info
+
+logger.alfresco-repo-version-VersionMigrator.name=org.alfresco.repo.version.VersionMigrator
+logger.alfresco-repo-version-VersionMigrator.level=info
+
+logger.alfresco-repo-module-ModuleServiceImpl.name=org.alfresco.repo.module.ModuleServiceImpl
+logger.alfresco-repo-module-ModuleServiceImpl.level=info
+
+logger.alfresco-repo-domain-schema-SchemaBootstrap.name=org.alfresco.repo.domain.schema.SchemaBootstrap
+logger.alfresco-repo-domain-schema-SchemaBootstrap.level=info
+
+logger.alfresco-repo-admin-ConfigurationChecker.name=org.alfresco.repo.admin.ConfigurationChecker
+logger.alfresco-repo-admin-ConfigurationChecker.level=info
+
+logger.alfresco-repo-node-index-AbstractReindexComponent.name=org.alfresco.repo.node.index.AbstractReindexComponent
+logger.alfresco-repo-node-index-AbstractReindexComponent.level=warn
+
+logger.alfresco-repo-node-index-IndexTransactionTracker.name=org.alfresco.repo.node.index.IndexTransactionTracker
+logger.alfresco-repo-node-index-IndexTransactionTracker.level=warn
+
+logger.alfresco-repo-node-index-FullIndexRecoveryComponent.name=org.alfresco.repo.node.index.FullIndexRecoveryComponent
+logger.alfresco-repo-node-index-FullIndexRecoveryComponent.level=info
+
+#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.name=org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl
+#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.level=warn
+
+logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.name=org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor
+logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.level=warn
+
+logger.alfresco-repo-transaction-RetryingTransactionHelper.name=org.alfresco.repo.transaction.RetryingTransactionHelper
+logger.alfresco-repo-transaction-RetryingTransactionHelper.level=warn
+
+logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.name=org.alfresco.util.transaction.SpringAwareUserTransaction.trace
+logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.level=warn
+
+logger.alfresco-util-AbstractTriggerBean.name=org.alfresco.util.AbstractTriggerBean
+logger.alfresco-util-AbstractTriggerBean.level=warn
+
+logger.alfresco-enterprise-repo-cluster.name=org.alfresco.enterprise.repo.cluster
+logger.alfresco-enterprise-repo-cluster.level=info
+
+logger.alfresco-repo-version-Version2ServiceImpl.name=org.alfresco.repo.version.Version2ServiceImpl
+logger.alfresco-repo-version-Version2ServiceImpl.level=warn
+
+#logger.alfresco-web-app-DebugPhaseListener.name=org.alfresco.web.app.DebugPhaseListener
+#logger.alfresco-web-app-DebugPhaseListener.level=debug
+
+logger.alfresco-repo-node-db-NodeStringLengthWorker.name=org.alfresco.repo.node.db.NodeStringLengthWorker
+logger.alfresco-repo-node-db-NodeStringLengthWorker.level=info
+
+logger.alfresco-repo-workflow.name=org.alfresco.repo.workflow
+logger.alfresco-repo-workflow.level=info
+
+# CIFS server debugging
+logger.alfresco-smb.protocol.name=org.alfresco.smb.protocol
+logger.alfresco-smb.protocol.level=error
+
+# FTP server debugging
+logger.alfresco-ftp-protocol.name=org.alfresco.ftp.protocol
+logger.alfresco-ftp-protocol.level=error
+
+# WebDAV debugging
+logger.alfresco-webdav-protocol.name=org.alfresco.webdav.protocol
+logger.alfresco-webdav-protocol.level=info
+
+# NTLM servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
+
+# Kerberos servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
+
+# File servers
+logger.alfresco-fileserver.name=org.alfresco.fileserver
+logger.alfresco-fileserver.level=warn
+
+# Repo filesystem debug logging
+#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
+
+# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
+logger.alfresco-repo-node-integrity.name=org.alfresco.repo.node.integrity
+logger.alfresco-repo-node-integrity.level=error
+
+# Indexer debugging
+logger.alfresco-repo-search-Indexer.name=org.alfresco.repo.search.Indexer
+logger.alfresco-repo-search-Indexer.level=error
+
+logger.alfresco-repo-search-impl-lucene-index.name=org.alfresco.repo.search.impl.lucene.index
+logger.alfresco-repo-search-impl-lucene-index.level=error
+
+logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.name=org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl
+logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.level=warn
+
+# Audit debugging
+logger.missingProperties.name=alfresco.missingProperties
+logger.missingProperties.level=warn
+
+# Property sheet and modelling debugging
+logger.missingProperties.name=alfresco.missingProperties
+logger.missingProperties.level=warn
+
+# Dictionary/Model debugging
+logger.alfresco-repo-dictionary.name=org.alfresco.repo.dictionary
+logger.alfresco-repo-dictionary.level=warn
+
+logger.alfresco-repo-dictionary-types-period.name=org.alfresco.repo.dictionary.types.period
+logger.alfresco-repo-dictionary-types-period.level=warn
+
+# Virtualization Server Registry
+logger.alfresco-mbeans-VirtServerRegistry.name=org.alfresco.mbeans.VirtServerRegistry
+logger.alfresco-mbeans-VirtServerRegistry.level=error
+
+# Spring context runtime property setter
+logger.alfresco-util-RuntimeSystemPropertiesSetter.name=org.alfresco.util.RuntimeSystemPropertiesSetter
+logger.alfresco-util-RuntimeSystemPropertiesSetter.level=info
+
+# Debugging options for clustering
+logger.alfresco-repo-content-ReplicatingContentStore.name=org.alfresco.repo.content.ReplicatingContentStore
+logger.alfresco-repo-content-ReplicatingContentStore.level=error
+
+logger.alfresco-repo-content-replication.name=org.alfresco.repo.content.replication
+logger.alfresco-repo-content-replication.level=error
+
+# Activity service
+logger.alfresco-repo-activities.name=org.alfresco.repo.activities
+logger.alfresco-repo-activities.level=warn
+
+# User usage tracking
+logger.alfresco-repo-usage.name=org.alfresco.repo.usage
+logger.alfresco-repo-usage.level=info
+
+# Sharepoint
+logger.alfresco-module-vti.name=org.alfresco.module.vti
+logger.alfresco-module-vti.level=info
+
+# Forms Engine
+logger.alfresco-web-config-forms.name=org.alfresco.web.config.forms
+logger.alfresco-web-config-forms.level=info
+
+logger.alfresco-web-scripts-forms.name=org.alfresco.web.scripts.forms
+logger.alfresco-web-scripts-forms.level=info
+
+# CMIS
+logger.alfresco-opencmis.name=org.alfresco.opencmis
+logger.alfresco-opencmis.level=error
+
+logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.name=org.alfresco.opencmis.AlfrescoCmisServiceInterceptor
+logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.level=error
+
+logger.alfresco-cmis.name=org.alfresco.cmis
+logger.alfresco-cmis.level=error
+
+logger.alfresco-cmis-dictionary.name=org.alfresco.cmis.dictionary
+logger.alfresco-cmis-dictionary.level=warn
+
+logger.apache-chemistry-opencmis.name=org.apache.chemistry.opencmis
+logger.apache-chemistry-opencmis.level=info
+
+logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.name=org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet
+logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.level=off
+
+logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.name=org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet
+logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.level=off
+
+# IMAP
+logger.alfresco-repo-imap.name=org.alfresco.repo.imap
+logger.alfresco-repo-imap.level=info
+
+# JBPM
+# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler
+logger.jbpm-graph-def-GraphElement.name=org.jbpm.graph.def.GraphElement
+logger.jbpm-graph-def-GraphElement.level=fatal
+
+
+# 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
+
+# Repository
+logger.alfresco-repo-web-scripts.name=org.alfresco.repo.web.scripts
+logger.alfresco-repo-web-scripts.level=warn
+
+logger.alfresco-repo-web-scripts-BaseWebScriptTest.name=org.alfresco.repo.web.scripts.BaseWebScriptTest
+logger.alfresco-repo-web-scripts-BaseWebScriptTest.level=info
+
+logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.name=org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger
+logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.level=off
+
+logger.alfresco-repo-jscript.name=org.alfresco.repo.jscript
+logger.alfresco-repo-jscript.level=error
+
+logger.alfresco-repo-jscript-ScriptLogger.name=org.alfresco.repo.jscript.ScriptLogger
+logger.alfresco-repo-jscript-ScriptLogger.level=warn
+
+logger.alfresco-repo-cmis-rest-CMISTest.name=org.alfresco.repo.cmis.rest.CMISTest
+logger.alfresco-repo-cmis-rest-CMISTest.level=info
+
+logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl
+logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.level=off
+
+logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptExecutorImpl
+logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.level=info
+
+logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.name=org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor
+logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.level=off
+
+logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.name=org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl
+logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.level=info
+
+# Bulk Filesystem Import Tool
+logger.alfresco-repo-bulkimport.name=org.alfresco.repo.bulkimport
+logger.alfresco-repo-bulkimport.level=warn
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+logger.runtime.name=freemarker.runtime
+logger.runtime.level=
+
+# Metadata extraction
+logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.name=org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter
+logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.level=warn
+
+# Reduces PDFont error level due to ALF-7105
+logger.apache-pdfbox-pdmodel-font-PDSimpleFont.name=org.apache.pdfbox.pdmodel.font.PDSimpleFont
+logger.apache-pdfbox-pdmodel-font-PDSimpleFont.level=fatal
+logger.apache-pdfbox-pdmodel-font-PDFont.name=org.apache.pdfbox.pdmodel.font.PDFont
+logger.apache-pdfbox-pdmodel-font-PDFont=fatal
+logger.apache-pdfbox-pdmodel-font-PDCIDFont.name=org.apache.pdfbox.pdmodel.font.PDCIDFont
+logger.apache-pdfbox-pdmodel-font-PDCIDFont.level=fatal
+
+# no index support
+logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.name=org.alfresco.repo.search.impl.noindex.NoIndexIndexer
+logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.level=fatal
+
+logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.name=org.alfresco.repo.search.impl.noindex.NoIndexSearchService
+logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.level=fatal
+
+# lucene index warnings
+logger.alfresco-repo-search-impl-lucene-index-IndexInfo.name=org.alfresco.repo.search.impl.lucene.index.IndexInfo
+logger.alfresco-repo-search-impl-lucene-index-IndexInfo.level=warn
+
+# Warn about RMI socket bind retries.
+logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.name=org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory
+logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.level=warn
+
+logger.alfresco-repo-usage-RepoUsageMonitor.name=org.alfresco.repo.usage.RepoUsageMonitor
+logger.alfresco-repo-usage-RepoUsageMonitor.level=info
+
+# Authorization
+logger.alfresco-enterprise-repo-authorization-AuthorizationService.name=org.alfresco.enterprise.repo.authorization.AuthorizationService
+logger.alfresco-enterprise-repo-authorization-AuthorizationService.level=info
+
+logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.name=org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor
+logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.level=warn
+
+#-----------------------------------------------------------------------
+# Platform module logging
+#-----------------------------------------------------------------------
+logger.${package}-platformsample-DemoComponent.name=${package}.platformsample.DemoComponent
+logger.${package}-platformsample-DemoComponent.level=debug
+logger.${package}-platformsample-HelloWorldWebScript.name=${package}.platformsample.HelloWorldWebScript
+logger.${package}-platformsample-HelloWorldWebScript.level=debug
+
+
+

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

@@ -36,5 +36,10 @@
                 </props>
             </list>
         </property>
+        <property name="labels">
+            <list>
+                <value>alfresco/module/${project.artifactId}/messages/workflow-messages</value>
+            </list>
+        </property>
     </bean>
 </beans>

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

@@ -0,0 +1 @@
+# Add here module-specific custom log4j2.properties configuration

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/messages/workflow-messages.properties

@@ -0,0 +1,5 @@
+#
+# Activiti My Process Workflow
+#
+my-process.workflow.title=My Process
+my-process.workflow.description=This is my custom process

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

@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+<definitions
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn"
+        xmlns:activiti="http://activiti.org/bpmn"
-   xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
+        xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" typeLanguage="http://www.w3.org/2001/XMLSchema"
-   xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema"
+        expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
-   expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
 
    <process id="my-process">
 
-      <startEvent id="start" />
+      <startEvent id="start" activiti:formKey="wf:submitAdhocTask"/>
-      <sequenceFlow id="flow1" sourceRef="start" targetRef="someTask" />
+      <sequenceFlow id="flow1" sourceRef="start" targetRef="someTask"/>
-      
-      <userTask id="someTask" name="Activiti is awesome!" />
-      <sequenceFlow id="flow2" sourceRef="someTask" targetRef="end" />
 
-      <endEvent id="end" />
+      <userTask id="someTask" name="Activiti is awesome!" activiti:formKey="wf:adhocTask">
+         <humanPerformer>
+            <resourceAssignmentExpression>
+               <formalExpression>${bpm_assignee.properties.userName}</formalExpression>
+            </resourceAssignmentExpression>
+         </humanPerformer>
+      </userTask>
+      <sequenceFlow id="flow2" sourceRef="someTask" targetRef="end"/>
+
+      <endEvent id="end"/>
 
    </process>
 

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/CustomContentModelIT.java

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

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/DemoComponentIT.java

@@ -0,0 +1,67 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/**
+ * Copyright (C) 2017 Alfresco Software Limited.
+ * <p/>
+ * This file is part of the Alfresco SDK project.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ${package}.platformsample;
+
+import org.alfresco.rad.test.AbstractAlfrescoIT;
+import org.alfresco.rad.test.AlfrescoTestRunner;
+import org.alfresco.rad.test.Remote;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Integration Test of the DemoComponent using the Alfresco Test Runner.
+ * The Alfresco Test Runner (i.e. AlfrescoTestRunner.class) will check if it is running in an Alfresco instance,
+ * if so it will execute normally locally. On the other hand, if it detects no
+ * Alfresco Spring context, then it will make a call to a custom Web Script that
+ * will execute this test in the running container remotely. The remote location is
+ * determined by the @Remote config.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @since 3.0
+ */
+@RunWith(value = AlfrescoTestRunner.class)
+public class DemoComponentIT extends AbstractAlfrescoIT {
+
+    @Test
+    public void testGetCompanyHome() {
+        DemoComponent demoComponent = (DemoComponent) getApplicationContext().getBean("${package}.DemoComponent");
+        NodeRef companyHome = demoComponent.getCompanyHome();
+        assertNotNull(companyHome);
+        String companyHomePath = getServiceRegistry().getNodeService().getPath(companyHome).toPrefixString(getServiceRegistry().getNamespaceService());
+        assertNotNull(companyHomePath);
+        assertEquals("/app:company_home", companyHomePath);
+    }
+
+    @Test
+    public void testChildNodesCount() {
+        DemoComponent demoComponent = (DemoComponent) getApplicationContext().getBean("${package}.DemoComponent");
+        NodeRef companyHome = demoComponent.getCompanyHome();
+        int childNodeCount = demoComponent.childNodesCount(companyHome);
+        assertNotNull(childNodeCount);
+        // There are 7 folders by default under Company Home
+        assertEquals(7, childNodeCount);
+    }
+}

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/HelloWorldWebScriptIT.java

@@ -0,0 +1,85 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/**
+ * Copyright (C) 2017 Alfresco Software Limited.
+ * <p/>
+ * This file is part of the Alfresco SDK project.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ${package}.platformsample;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Integration Test (IT) for Hello World web script.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @version 1.0
+ * @since 3.0
+ */
+public class HelloWorldWebScriptIT {
+
+    private static final String ACS_ENDPOINT_PROP = "acs.endpoint.path";
+    private static final String ACS_DEFAULT_ENDPOINT = "http://localhost:8080/alfresco";
+
+    @Test
+    public void testWebScriptCall() throws Exception {
+        String webscriptURL = getPlatformEndpoint() + "/service/sample/helloworld";
+        String expectedResponse = "Message: 'Hello from JS!' 'HelloFromJava'";
+
+        // Login credentials for Alfresco Repo
+        CredentialsProvider provider = new BasicCredentialsProvider();
+        UsernamePasswordCredentials credentials = new UsernamePasswordCredentials("admin", "admin");
+        provider.setCredentials(AuthScope.ANY, credentials);
+
+        // Create HTTP Client with credentials
+        CloseableHttpClient httpclient = HttpClientBuilder.create()
+                .setDefaultCredentialsProvider(provider)
+                .build();
+
+        // Execute Web Script call
+        try {
+            HttpGet httpget = new HttpGet(webscriptURL);
+            HttpResponse httpResponse = httpclient.execute(httpget);
+            assertEquals("Incorrect HTTP Response Status",
+                    HttpStatus.SC_OK, httpResponse.getStatusLine().getStatusCode());
+            HttpEntity entity = httpResponse.getEntity();
+            assertNotNull("Response from Web Script is null", entity);
+            assertEquals("Incorrect Web Script Response", expectedResponse, EntityUtils.toString(entity));
+        } finally {
+            httpclient.close();
+        }
+    }
+
+    private String getPlatformEndpoint() {
+        final String platformEndpoint = System.getProperty(ACS_ENDPOINT_PROP);
+        return StringUtils.isNotBlank(platformEndpoint) ? platformEndpoint : ACS_DEFAULT_ENDPOINT;
+    }
+}

archetypes/alfresco-share-jar-archetype/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.0.0-beta-1</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -51,6 +51,7 @@
                     <delimiters>
                         <delimiter>@@</delimiter>
                     </delimiters>
+                    <addDefaultExcludes>false</addDefaultExcludes>
                 </configuration>
             </plugin>
         </plugins>

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

@@ -80,6 +80,7 @@
         <fileSet encoding="UTF-8" filtered="true">
             <directory></directory>
             <includes>
+                <include>.gitignore</include>
                 <include>run.sh</include>
                 <include>run.bat</include>
                 <include>README.md</include>

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/.gitignore

@@ -0,0 +1,38 @@
+**.log*
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+# Eclipse
+.metadata
+.project
+.classpath
+bin/
+tmp/
+*.tmp
+.settings/
+.loadpath
+.recommenders
+
+# IntelliJ IDEA
+**.idea
+**.iml
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# macOS
+*.DS_Store

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md

@@ -1,6 +1,6 @@
-# Alfresco Share JAR Module - SDK 4.0
+# Alfresco Share JAR Module - SDK 4.9
 
-This is a Share project for Alfresco SDK 4.0.
+This is a Share project for Alfresco SDK 4.9.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 
@@ -20,9 +20,6 @@ All the services of the project are now run as docker containers. The run script
  * `tail`. Tail the logs of all the containers.
  * `reload_share`. Build the Share module, recreate the Share docker image and restart the Share container.
  * `reload_acs`. Build the ACS module, recreate the ACS docker image and restart the ACS container.
- * `build_test`. Build the whole project, recreate the Share docker image, start the dockerised environment, execute the integration tests from the
- `integration-tests` module and stop the environment.
- * `test`. Execute the integration tests (the environment must be already started).
 
 # Few things to notice
 

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

@@ -7,60 +7,70 @@ services:
       dockerfile: ./Dockerfile
       context: ../../../target
     environment:
-      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
+      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
-      REPO_HOST: ${rootArtifactId}-acs
+      REPO_HOST: ${symbol_dollar}{acs.host}
-      REPO_PORT: 8080
+      REPO_PORT: ${symbol_dollar}{acs.port}
     ports:
       - "${symbol_dollar}{share.port}:8080"
       - "${symbol_dollar}{share.debug.port}:8888"
-  ${rootArtifactId}-acs:
+# Optional
-    image: ${symbol_dollar}{docker.acs.image}:${symbol_dollar}{alfresco.platform.version}
+#  ${rootArtifactId}-acs:
-    environment:
+#    image: ${symbol_dollar}{docker.acs.image}:${symbol_dollar}{alfresco.platform.version}
-      JAVA_OPTS: "
+#    environment:
-                -Ddb.driver=org.postgresql.Driver
+#      JAVA_OPTS: "
-                -Ddb.username=alfresco
+#                -Ddb.driver=org.postgresql.Driver
-                -Ddb.password=alfresco
+#                -Ddb.username=alfresco
-                -Ddb.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
+#                -Ddb.password=alfresco
-                -Dsolr.host=${rootArtifactId}-ass
+#                -Ddb.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
-                -Dsolr.port=8983
+#                -Dsolr.host=${rootArtifactId}-ass
-                -Dsolr.secureComms=none
+#                -Dsolr.port=8983
-                -Dsolr.base.url=/solr
+#                -Dsolr.secureComms=secret
-                -Dindex.subsystem.name=solr6
+#                -Dsolr.sharedSecret=secret
-                -Dcsrf.filter.enabled=false
+#                -Dsolr.base.url=/solr
-                "
+#                -Dindex.subsystem.name=solr6
-    ports:
+#                -Dcsrf.filter.enabled=false
-      - "${symbol_dollar}{acs.port}:8080"
+#                -Dmessaging.broker.url=\"vm://localhost?broker.persistent=false\"
-    volumes:
+#                -Dtransform.service.enabled=false
-      - ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data
+#                -Dlocal.transform.service.enabled=false
-    depends_on:
+#                -Dlegacy.transform.service.enabled=false
-      - ${rootArtifactId}-postgres
+#                ${symbol_dollar}{keystore.settings}
-  ${rootArtifactId}-postgres:
+#                "
-    image: postgres:9.6
+#    ports:
-    environment:
+#      - "${symbol_dollar}{acs.port}:8080"
-      POSTGRES_DB: alfresco
+#    volumes:
-      POSTGRES_USER: alfresco
+#      - ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data
-      POSTGRES_PASSWORD: alfresco
+#    depends_on:
-    ports:
+#      - ${rootArtifactId}-postgres
-      - "${symbol_dollar}{postgres.port}:5432"
+#  ${rootArtifactId}-postgres:
-    volumes:
+#    image: postgres:9.6
-      - ${rootArtifactId}-db-volume:/var/lib/postgresql/data
+#    environment:
-  ${rootArtifactId}-ass:
+#      POSTGRES_DB: alfresco
-    image: alfresco/alfresco-search-services:1.2.0
+#      POSTGRES_USER: alfresco
-    environment:
+#      POSTGRES_PASSWORD: alfresco
-      SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
+#    command: postgres -c max_connections=300 -c log_min_messages=LOG
-      SOLR_ALFRESCO_PORT: 8080
+#    ports:
-      SOLR_SOLR_HOST: ${rootArtifactId}-ass
+#      - "${symbol_dollar}{postgres.port}:5432"
-      SOLR_SOLR_PORT: 8983
+#    volumes:
-      SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+#      - ${rootArtifactId}-db-volume:/var/lib/postgresql/data
-    ports:
+#  ${rootArtifactId}-ass:
-      - "8983:8983"
+#    image: alfresco/alfresco-search-services:2.0.3
-    volumes:
+#    environment:
-      - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
+#      SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
-      - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
+#      SOLR_ALFRESCO_PORT: 8080
-volumes:
+#      SOLR_SOLR_HOST: ${rootArtifactId}-ass
-  ${rootArtifactId}-acs-volume:
+#      SOLR_SOLR_PORT: 8983
-    external: true
+#      SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
-  ${rootArtifactId}-db-volume:
+#      ALFRESCO_SECURE_COMMS: "secret"
-    external: true
+#      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
-  ${rootArtifactId}-ass-volume:
+#    ports:
-    external: true
+#      - "8983:8983"
+#    volumes:
+#      - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
+#      - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
+#volumes:
+#  ${rootArtifactId}-acs-volume:
+#    external: true
+#  ${rootArtifactId}-db-volume:
+#    external: true
+#  ${rootArtifactId}-ass-volume:
+#    external: true

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

@@ -19,18 +19,18 @@
         <alfresco.groupId>org.alfresco</alfresco.groupId>
         <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
         <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
+        <alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
         <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
+        <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
 
         <!-- Docker images -->
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
         <docker.share.image>@@alfresco.share.docker.image@@</docker.share.image>
 
-        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
+        <keystore.settings>@@keystore.settings@@</keystore.settings>
-        <jrebel.version>1.1.6</jrebel.version>
 
-        <!-- Compile with Java 8, default is 5 -->
+        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <jrebel.version>1.1.8</jrebel.version>
-        <maven.compiler.target>1.8</maven.compiler.target>
 
         <!-- Environment configuration properties -->
         <share.port>8180</share.port>
@@ -96,12 +96,47 @@
 
     <build>
         <plugins>
+            <!--
+                                Build an AMP if 3rd party libs are needed by the extensions
+                                JARs are the default artifact produced in your modules, if you want to build an amp for each module
+                                you have to enable this plugin and inspect the src/main/assembly.xml file if you want to customize
+                                the layout of your AMP. The end result is that Maven will produce both a JAR file and an AMP with your
+                                module.
+                            -->
+            <!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>build-amp-file</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptor>src/main/assembly/amp.xml</descriptor>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.alfresco.maven.plugin</groupId>
+                        <artifactId>alfresco-maven-plugin</artifactId>
+                        <version>${alfresco.sdk.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            -->
+
             <!-- Filter the test resource files in the AIO parent project, and do property substitutions.
                  We need this config so this is done before the Alfresco Maven Plugin 'run' is executed. -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
                     <nonFilteredFileExtensions> <!-- jpg, jpeg, gif, bmp and png are added automatically -->
@@ -164,83 +199,113 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-share-extension</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/extensions</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>target</directory>
+                                    <includes>
+                                        <include>${project.build.finalName}.jar</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Compress JavaScript files and store as *.min.js -->
+            <plugin>
+                <groupId>com.github.blutorange</groupId>
+                <artifactId>closure-compiler-maven-plugin</artifactId>
+                <version>2.28.0</version>
+                <executions>
+                    <!-- Compress the JS files under the assembly folder -->
+                    <execution>
+                        <id>compress-assembly</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>minify</goal>
+                        </goals>
+                        <configuration>
+                            <baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
+                            <baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
+                            <sourceDir>web</sourceDir>
+                            <targetDir>web</targetDir>
+                            <skipMerge>true</skipMerge>
+                            <includes>
+                                <include>**/*.js</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/webscripts/**</exclude>
+                                <exclude>**/site-webscripts/**</exclude>
+                                <exclude>**/META-INF/**</exclude>
+                                <exclude>**/*.lib.js</exclude>
+                                <exclude>**/*.css</exclude>
+                                <exclude>**/*.min.js</exclude>
+                                <exclude>**/*.min.css</exclude>
+                            </excludes>
+                            <force>true</force>
+                        </configuration>
+                    </execution>
+                    <!-- Compress the JS files under the resources folder -->
+                    <execution>
+                        <id>compress-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>minify</goal>
+                        </goals>
+                        <configuration>
+                            <baseSourceDir>${project.basedir}/src/main</baseSourceDir>
+                            <baseTargetDir>${project.basedir}/src/main</baseTargetDir>
+                            <sourceDir>resources</sourceDir>
+                            <targetDir>resources</targetDir>
+                            <skipMerge>true</skipMerge>
+                            <includes>
+                                <include>**/*.js</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/webscripts/**</exclude>
+                                <exclude>**/site-webscripts/**</exclude>
+                                <exclude>**/*.lib.js</exclude>
+                                <exclude>**/*.css</exclude>
+                                <exclude>**/*.min.js</exclude>
+                                <exclude>**/*.min.css</exclude>
+                            </excludes>
+                            <force>true</force>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.1</version>
                 <executions>
-                    <!-- Copy the share extension -->
+                    <!-- Collect extensions (JARs or AMPs) declared in this module to be deployed to docker -->
                     <execution>
-                        <id>copy-repo-extension</id>
+                        <id>collect-extensions</id>
-                        <phase>pre-integration-test</phase>
+                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>${groupId}</groupId>
-                                    <artifactId>${artifactId}</artifactId>
-                                    <version>${version}</version>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/extensions</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <!-- Copy other dependencies (JARs or AMPs) declared in the share module -->
-                    <execution>
-                        <id>copy-third-party-dependencies</id>
-                        <phase>pre-integration-test</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/extensions</outputDirectory>
                             <includeScope>runtime</includeScope>
+                            <!-- IMPORTANT: if using amp dependencies only, add <includeTypes>amp</includeTypes> -->
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
-            <!--
-                                Build an AMP if 3rd party libs are needed by the extensions
-                                JARs are the default artifact produced in your modules, if you want to build an amp for each module
-                                you have to enable this plugin and inspect the src/main/assembly.xml file if you want to customize
-                                the layout of your AMP. The end result is that Maven will produce both a JAR file and an AMP with your
-                                module.
-                            -->
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <id>build-amp-file</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptor>src/main/assembly/amp.xml</descriptor>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.alfresco.maven.plugin</groupId>
-                        <artifactId>alfresco-maven-plugin</artifactId>
-                        <version>${alfresco.sdk.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            -->
-
             <!-- Hot reloading with JRebel -->
             <plugin>
                 <groupId>org.zeroturnaround</groupId>
@@ -294,6 +359,64 @@
         </testResources>
     </build>
 
+    <profiles>
+        <profile>
+            <id>java8</id>
+            <activation>
+                <jdk>[1.8,11.0)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.0</version>
+                        <configuration>
+                            <source>1.8</source>
+                            <target>1.8</target>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>java11</id>
+            <activation>
+                <jdk>[11.0,17)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.0</version>
+                        <configuration>
+                            <release>11</release>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>java17</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.0</version>
+                        <configuration>
+                            <release>17</release>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <!--
         Alfresco Maven Repositories
         -->
@@ -315,6 +438,10 @@
             <id>alfresco-private-repository</id>
             <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
         </repository>
+        <repository>
+            <id>alfresco-internal</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -331,4 +458,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-</project>
+</project>

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat

@@ -47,20 +47,7 @@ IF %1==reload_share (
     CALL :tail
     GOTO END
 )
-IF %1==build_test (
+echo "Usage: %0 {build_start|start|stop|purge|tail|reload_share}"
-    CALL :down
-    CALL :build
-    CALL :start
-    CALL :test
-    CALL :tail_all
-    CALL :down
-    GOTO END
-)
-IF %1==test (
-    CALL :test
-    GOTO END
-)
-echo "Usage: %0 {build_start|start|stop|purge|tail|reload_share|build_test|test}"
 :END
 EXIT /B %ERRORLEVEL%
 
@@ -68,36 +55,32 @@ EXIT /B %ERRORLEVEL%
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
 EXIT /B 0
 :start_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
 EXIT /B 0
 :down
-    docker-compose -f "%COMPOSE_FILE_PATH%" down
+    if exist "%COMPOSE_FILE_PATH%" (
+        docker compose -f "%COMPOSE_FILE_PATH%" down
+    )
 EXIT /B 0
 :build
-    docker rmi alfresco-content-services-${rootArtifactId}:development
+	call %MVN_EXEC% clean package
-    docker rmi alfresco-share-${rootArtifactId}:development
-	call %MVN_EXEC% clean install -DskipTests
 EXIT /B 0
 :build_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
-    docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
-    docker rmi alfresco-share-${rootArtifactId}:development
+	call %MVN_EXEC% clean package
-	call %MVN_EXEC% clean install -DskipTests
 EXIT /B 0
 :tail
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
+    docker compose -f "%COMPOSE_FILE_PATH%" logs -f
 EXIT /B 0
 :tail_all
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
-EXIT /B 0
-:test
-    call %MVN_EXEC% verify
 EXIT /B 0
 :purge
-    docker volume rm ${rootArtifactId}-acs-volume
+    docker volume rm -f ${rootArtifactId}-acs-volume
-    docker volume rm ${rootArtifactId}-db-volume
+    docker volume rm -f ${rootArtifactId}-db-volume
-    docker volume rm ${rootArtifactId}-ass-volume
+    docker volume rm -f ${rootArtifactId}-ass-volume
 EXIT /B 0

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh

@@ -1,7 +1,7 @@
 #set( $symbol_dollar = '$' )
 #!/bin/sh
 
-export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml
+export COMPOSE_FILE_PATH="${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml"
 
 if [ -z "${symbol_dollar}{M2_HOME}" ]; then
   export MVN_EXEC="mvn"
@@ -13,45 +13,41 @@ start() {
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
 }
 
 start_share() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
 }
 
 down() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down
+    if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
+        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
+    fi
 }
 
 purge() {
-    docker volume rm ${rootArtifactId}-acs-volume
+    docker volume rm -f ${rootArtifactId}-acs-volume
-    docker volume rm ${rootArtifactId}-db-volume
+    docker volume rm -f ${rootArtifactId}-db-volume
-    docker volume rm ${rootArtifactId}-ass-volume
+    docker volume rm -f ${rootArtifactId}-ass-volume
 }
 
 build() {
-    docker rmi alfresco-share-${rootArtifactId}:development
+    ${symbol_dollar}MVN_EXEC clean package
-    ${symbol_dollar}MVN_EXEC clean install -DskipTests=true
 }
 
 build_share() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
-    yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-share
+    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
-    docker rmi alfresco-share-${rootArtifactId}:development
+    ${symbol_dollar}MVN_EXEC clean package
-    ${symbol_dollar}MVN_EXEC clean install -DskipTests=true
 }
 
 tail() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs -f
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
 }
 
 tail_all() {
-    docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs --tail="all"
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
-}
-
-test() {
-    ${symbol_dollar}MVN_EXEC verify
 }
 
 case "${symbol_dollar}1" in
@@ -80,17 +76,6 @@ case "${symbol_dollar}1" in
     start_share
     tail
     ;;
-  build_test)
-    down
-    build
-    start
-    test
-    tail_all
-    down
-    ;;
-  test)
-    test
-    ;;
   *)
-    echo "Usage: ${symbol_dollar}0 {build_start|start|stop|purge|tail|reload_share|build_test|test}"
+    echo "Usage: ${symbol_dollar}0 {build_start|start|stop|purge|tail|reload_share}"
 esac

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

@@ -35,6 +35,11 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
+        <!-- Add module-specific log4j2.properties configuration at top level in the AMP -->
+        <file>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j2.properties</source>
+            <filtered>false</filtered>
+        </file>
     </files>
 
     <fileSets>