[maven-release-plugin][skip ci] prepare release 7.0.0-TEST4

- fix release script

.gitattributes

@@ -1,8 +1,8 @@
-.* eol=crlf
-*.html eol=crlf
-*.java eol=crlf
-*.txt eol=crlf
-*.css eol=crlf
-*.xml eol=crlf
-*.js eol=crlf
-*.properties eol=crlf
+# .* eol=crlf
+# *.html eol=crlf
+# *.java eol=crlf
+# *.txt eol=crlf
+# *.css eol=crlf
+# *.xml eol=crlf
+# *.js eol=crlf
+# *.properties eol=crlf

.gitignore

@@ -10,6 +10,9 @@
 *.iml
 *.iws
 
+#VSCode
+/.vscode
+
 # Mac
 .DS_Store
 
@@ -18,20 +21,21 @@ target
 *.log
 *.log.*
 
-# Mobile Tools for Java (J2ME)
-
-.mtj
-.tmp/
 
 # Package Files #
-
 *.jar
 *.war
 *.ear
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-
 hs_err_pid*
 
 # Alfresco
-alf_data/
+alf_data/
+
+helm/alfresco-content-services-community/charts/*
+helm/alfresco-content-services-community/requirements.lock
+helm/alfresco-content-services-community*.tgz
+
+# Travis deployment folder 
+deploy_dir

.travis.settings.xml

@@ -0,0 +1,53 @@
+<settings>
+    <profiles>
+        <profile>
+            <id>alfresco-internal</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>alfresco-internal</id>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                    <name>Alfresco Internal Repository</name>
+                    <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>alfresco-internal</id>
+                    <name>Alfresco Internal Repository</name>
+                    <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+                </pluginRepository>
+            </pluginRepositories>
+            <properties>
+                <!-- WhiteSource token -->
+                <org.whitesource.orgToken>${env.WHITESOURCE_API_KEY}</org.whitesource.orgToken>
+            </properties>
+        </profile>
+    </profiles>
+
+
+    <servers>
+        <server>
+            <id>alfresco-internal</id>
+            <username>${env.MAVEN_USERNAME}</username>
+            <password>${env.MAVEN_PASSWORD}</password>
+        </server>
+        <server>
+            <id>quay.io</id>
+            <username>${env.QUAY_USERNAME}</username>
+            <password>${env.QUAY_PASSWORD}</password>
+        </server>
+        <server>
+            <id>docker.io</id>
+            <username>${env.DOCKERHUB_USERNAME}</username>
+            <password>${env.DOCKERHUB_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>

.travis.yml

@@ -0,0 +1,148 @@
+---
+dist: xenial
+language: java
+jdk: openjdk11
+
+services:
+  - docker
+
+git:
+  depth: false
+  quiet: true
+
+cache:
+  directories:
+    - ${HOME}/.m2/repository
+
+# the cache can grow constantly
+before_cache: bash scripts/travis/cleanup_cache.sh
+
+branches:
+  only:
+    - master
+    - develop
+    - /release\/.*/
+    - feature/REPO-5111_repo_build
+
+env:
+  global:
+    - TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
+    - TAS_ENVIRONMENT=./tests/environment
+    # Must be in the format <alfresco-version>-<additional_versioning> ie. 6.3.0-repo-xxxx-x or 6.3.0-Ax
+    - RELEASE_VERSION=7.0.0-TEST4
+    - DEVELOPMENT_VERSION=7.0.0-TEST5-SNAPSHOT
+
+stages:
+  - name: test
+    if: commit_message !~ /\[skip tests\]/
+  - name: docker_latest
+    if: fork = false AND type != pull_request AND branch = master
+  - name: release
+    if: commit_message ~= /\[release\]/ AND fork = false AND type != pull_request AND (branch =~ ^(master|develop)$ OR branch =~ /release\/.*/ OR branch = feature/REPO-5111_repo_build)
+  - name: publish
+    if: commit_message ~= /\[publish\]/ AND fork = false AND type != pull_request AND (branch =~ ^(master|develop)$ OR branch =~ /release\/.*/)
+
+before_install: travis_retry bash scripts/travis/init.sh
+install: travis_retry travis_wait 40 bash scripts/travis/build.sh
+
+jobs:
+  include:
+    - name: "WhiteSource scan"
+      stage: test
+      # only on master or develop and if it is not a PR
+      if: fork = false AND branch =~ ^(master|develop)$ AND type != pull_request
+      install: travis_retry travis_wait 30 mvn -B -q install -f war/pom.xml
+      script:
+        # Download the latest version of WhiteSource Unified Agent
+        - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar
+        # Run WhiteSource Unified Agent
+        - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war
+
+    - name: "REST API TAS tests part1"
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 60 mvn -B install -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false
+
+    - name: "REST API TAS tests part2"
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 60 mvn -B install -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false
+
+    - name: "REST API TAS tests part3"
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 60 mvn -B install -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false
+
+    - name: "CMIS TAS tests"
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 40 mvn -B install -f tests/tas-cmis/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+
+    - name: "Email TAS tests"
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 30 mvn -B install -f tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+
+    - name: "WebDAV TAS tests"
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 20 mvn -B install -f tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+
+    - name: "Integration TAS tests"
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 30 mvn -B install -f tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+
+    - name: "Update Docker latest images"
+      stage: docker_latest
+      script: travis_retry travis_wait 30 mvn -B -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pinternal
+
+    - name: "Release and Copy to S3 Staging"
+      stage: release
+      before_script: bash scripts/travis/verify_release_tag.sh
+      script: travis_wait 40 bash scripts/travis/maven_release.sh
+      before_deploy:
+        # Move the final artifacts to a single folder (deploy_dir) to be copied to S3
+        - mkdir -p deploy_dir
+        - cp distribution/target/alfresco.war deploy_dir
+        - cp distribution/target/*-distribution*.zip deploy_dir
+      deploy:
+        - provider: s3
+          access_key_id: "${AWS_STAGING_ACCESS_KEY}"
+          secret_access_key: "${AWS_STAGING_SECRET_KEY}"
+          bucket: "alfresco-artefacts-staging"
+          region: "eu-west-1"
+          skip_cleanup: true
+          acl: private
+          local_dir: "deploy_dir"
+          upload_dir: "alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}"
+          on:
+            all_branches: true
+
+    - name: "Copy to S3 Release"
+      stage: publish
+      # Nothing to build/install as we are just copying from S3 buckets
+      install: skip
+      script: skip
+      before_deploy: pip install awscli
+      deploy:
+        - provider: script
+          script: bash scripts/travis/copy_to_release_bucket.sh
+          on:
+            branch: master
+
+

.whitesource

@@ -0,0 +1,8 @@
+{
+  "generalSettings": {
+    "shouldScanRepo": true
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure"
+  }
+}

.wss-unified-agent.config

@@ -0,0 +1,228 @@
+####################################################################
+# WhiteSource Unified-Agent configuration file
+####################################################################
+##########################################
+# GENERAL SCAN MODE: Files and Package Managers
+##########################################
+  
+checkPolicies=true
+forceCheckAllDependencies=true
+forceUpdate=true
+forceUpdate.failBuildOnPolicyViolation=true
+offline=false
+#ignoreSourceFiles=true
+#scanComment=
+#updateInventory=false
+#resolveAllDependencies=false
+#failErrorLevel=ALL
+#requireKnownSha1=false
+#generateScanReport=true
+#scanReportTimeoutMinutes=10
+#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model
+   
+#projectPerFolder=true
+#projectPerFolderIncludes=
+#projectPerFolderExcludes=
+   
+#wss.connectionTimeoutMinutes=60
+# Change the below URL to your WhiteSource server.
+# Use the 'WhiteSource Server URL' which can be retrieved
+# from your 'Profile' page on the 'Server URLs' panel.
+# Then, add the '/agent' path to it.
+wss.url=https://saas.whitesourcesoftware.com/agent
+  
+#npm.resolveDependencies=false
+#npm.ignoreSourceFiles=false
+#npm.includeDevDependencies=true
+#npm.runPreStep=true
+#npm.ignoreNpmLsErrors=true
+#npm.ignoreScripts=true
+#npm.yarnProject=true
+#npm.accessToken=
+#npm.identifyByNameAndVersion=true
+ 
+#bower.resolveDependencies=false
+#bower.ignoreSourceFiles=true
+#bower.runPreStep=true
+   
+#nuget.resolvePackagesConfigFiles=false
+#nuget.resolveCsProjFiles=false
+#nuget.resolveDependencies=false
+#nuget.restoreDependencies=true
+#nuget.ignoreSourceFiles=true
+#nuget.runPreStep=true
+#nuget.resolveNuspecFiles=false
+   
+#python.resolveDependencies=false
+#python.ignoreSourceFiles=false
+#python.ignorePipInstallErrors=true
+#python.installVirtualenv=true
+#python.resolveHierarchyTree=false
+#python.requirementsFileIncludes=requirements.txt
+#python.resolveSetupPyFiles=true
+#python.runPipenvPreStep=true
+#python.pipenvDevDependencies=true
+#python.IgnorePipenvInstallErrors=true
+   
+#maven.ignoredScopes=test provided
+maven.resolveDependencies=true
+#maven.ignoreSourceFiles=true
+#maven.aggregateModules=true
+maven.ignorePomModules=false
+#maven.runPreStep=true
+#maven.ignoreMvnTreeErrors=true
+#maven.environmentPath=
+#maven.m2RepositoryPath=
+  
+#gradle.ignoredScopes=
+#gradle.resolveDependencies=false
+#gradle.runAssembleCommand=false
+#gradle.runPreStep=true
+#gradle.ignoreSourceFiles=true
+#gradle.aggregateModules=true
+#gradle.preferredEnvironment=wrapper
+#gradle.localRepositoryPath=
+ 
+#paket.resolveDependencies=false
+#paket.ignoredGroups=
+#paket.ignoreSourceFiles=false
+#paket.runPreStep=true
+#paket.exePath=
+ 
+#go.resolveDependencies=false
+#go.collectDependenciesAtRuntime=true
+#go.dependencyManager=
+#go.ignoreSourceFiles=true
+#go.glide.ignoreTestPackages=false
+#go.gogradle.enableTaskAlias=true
+ 
+#ruby.resolveDependencies = false
+#ruby.ignoreSourceFiles = false
+#ruby.installMissingGems = true
+#ruby.runBundleInstall = true
+#ruby.overwriteGemFile = true
+ 
+#sbt.resolveDependencies=false
+#sbt.ignoreSourceFiles=true
+#sbt.aggregateModules=true
+#sbt.runPreStep=true
+#sbt.targetFolder=
+ 
+#php.resolveDependencies=false
+#php.runPreStep=true
+#php.includeDevDependencies=true
+ 
+#html.resolveDependencies=false
+ 
+#cocoapods.resolveDependencies=false
+#cocoapods.runPreStep=true
+#cocoapods.ignoreSourceFiles=false
+ 
+#hex.resolveDependencies=false
+#hex.runPreStep=true
+#hex.ignoreSourceFiles=false
+#hex.aggregateModules=true
+ 
+##################################
+# Organization tokens:
+##################################
+apiKey=
+ 
+#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option
+#userKey=
+   
+projectName=content-services-community
+projectVersion=
+projectToken=
+   
+productName=ACS Community
+productVersion=
+productToken=
+#updateType=APPEND
+#requesterEmail=user@provider.com
+    
+#########################################################################################
+# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE
+#########################################################################################
+#includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx
+   
+#includes=**/*.m **/*.mm  **/*.js **/*.php
+includes=**/*.jar
+#includes=**/*.gem **/*.rb
+#includes=**/*.dll **/*.cs **/*.nupkg
+#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2
+#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py
+   
+## Exclude file extensions or specific directories by adding **/*.<extension> or **<excluded_dir>/**
+excludes=**/*sources.jar **/*javadoc.jar
+   
+case.sensitive.glob=false
+followSymbolicLinks=true
+    
+##################################
+# Archive properties
+##################################
+#archiveExtractionDepth=2
+#archiveIncludes=**/*.war **/*.ear
+#archiveExcludes=**/*sources.jar
+    
+##################################
+# Proxy settings
+##################################
+#proxy.host=
+#proxy.port=
+#proxy.user=
+#proxy.pass=
+    
+##################################
+# SCM settings
+##################################
+#scm.type=
+#scm.user=
+#scm.pass=
+#scm.ppk=
+#scm.url=
+#scm.branch=
+#scm.tag=
+#scm.npmInstall=
+#scm.npmInstallTimeoutMinutes=
+#scm.repositoriesFile=
+   
+##############################################
+# SCAN MODE: Linux package manager settings
+##############################################
+#scanPackageManager=true
+  
+##################################
+# SCAN MODE: Docker images
+##################################
+#docker.scanImages=true
+#docker.includes=.*.*
+#docker.excludes=
+#docker.pull.enable=true
+#docker.pull.images=.*.*
+#docker.pull.maxImages=10
+#docker.pull.tags=.*.*
+#docker.pull.digest=
+#docker.delete.force=true
+#docker.login.sudo=false
+ 
+#docker.aws.enable=true
+#docker.aws.registryIds=
+ 
+##################################
+# SCAN MODE: Docker containers
+##################################
+#docker.scanContainers=true
+#docker.containerIncludes=.*.*
+#docker.containerExcludes=
+ 
+################################
+# Serverless settings
+################################
+#serverless.provider=
+#serverless.scanFunctions=true
+#serverless.includes=
+#serverless.excludes=
+#serverless.region=
+#serverless.maxFunctions=10

CHANGELOG.md

@@ -0,0 +1,218 @@
+<h1>        Release Notes - Alfresco - Version Community Edition 201911 GA
+</h1>
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/MNT-20436'>MNT-20436</a>] -         “POST /nodes/{nodeId}/children” RestAPI does not create a node without having a mandatory value object, but it outputs the 201 successful response.
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/MNT-20714'>MNT-20714</a>] -         [HotFix] /nodes/{nodeId}/content REST API fails for content created by a deleted user
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/MNT-20770'>MNT-20770</a>] -         Share non responsive during direct download from S3 if content store selector is also configured
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/MNT-20863'>MNT-20863</a>] -         Changing cm:name with REST API /nodes/{nodeId} does not update Primary Path
+</li>
+</ul>
+
+<h1>        Release Notes - Alfresco - Version Community Edition 201910 EA
+</h1>
+<h2>
+  New Features
+</h2>
+<ul>
+  <li>
+    <h4>Custom Transforms and Renditions</h4>
+    <p>Alfresco Content Services (ACS) provides a number of content
+     transforms, but also allows custom transforms to be added.
+    <p>It is now possible to create custom transforms that run in 
+    separate processes known as T-Engines (short for Transformer
+    Engines). The same engines may be used in Community and 
+    Enterprise Editions. They may be directly connected to the ACS 
+    repository as Local Transforms, but in the Enterprise edition there 
+    is the option to include them as part of the Transform Service 
+    which provides more balanced throughput and better administration 
+    capabilities.
+    <p>For more information see <a href='https://github.com/Alfresco/acs-packaging/blob/master/docs/custom-transforms-and-renditions.md'>Custom Transforms and Renditions</a>
+  </li>
+      <li>
+      <h4>Open-source Transformation Engines</h4>
+      <p>The core T-Engine images can now be used in Community
+       Edition.</p>
+       <p>T-Engines code has been Open-Sourced and is available on Github:</p>
+       <ul><a href='https://github.com/Alfresco/alfresco-transform-core'>alfresco/alfresco-transform-core</a></ul>
+       <p>Images are available on Docker Hub:</p>
+       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-imagemagick'>alfresco/alfresco-imagemagick</a></ul>
+       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-pdf-renderer'>alfresco/alfresco-pdf-renderer</a></ul>
+       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-libreoffice'>alfresco/alfresco-libreoffice</a></ul>
+       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-tika'>alfresco/alfresco-tika</a></ul>
+       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-transform-misc'>alfresco/alfresco-transform-misc</a></ul>
+       </p>
+    </li>
+    <li>
+    <h4>Removal of external executables from docker image</h4>
+    <p>With the introduction of the new Local Transform Service
+    in Alfresco Community Edition, the capability of executing
+    remote transformations on T-Engines was enabled. Because of
+    this, the external executables (Alfresco-Pdf-renderer, Libreoffice
+    and Imagemagick) have been removed from the docker container to
+    facilitate the usage of out-of-process transformations.
+     </p>
+  </li>
+</ul>
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22013'>ALF-22013</a>] -         Docker Image for Base Tomcat locale is POSIX
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22060'>ALF-22060</a>] -         Reader on the backing store is obtained twice in CachingContentStore
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22056'>ALF-22056</a>] -         onCopyCompleteBehaviour not called in order of copy-action
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22073'>ALF-22073</a>] -         MailActionExecutor doesn't consider email bodies with a HTML doctype as HTML
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21988'>ALF-21988</a>] -         Tab order for number ranges not ok
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22097'>ALF-22097</a>] -         T Engine - add source nodeId parameter
+</li>
+</ul>
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-4318'>REPO-4318</a>] -         [COMPLETE] Extraction of transformers and metadata extractors
+</li>
+</ul>
+<h2>
+
+<h1>        Release Notes - Alfresco - Version Community Edition 201901 GA
+</h1>
+<h2>
+  New Features
+</h2>
+<ul>
+  <li>
+    <h4>ActiveMQ:</h4>
+    Alfresco ActiveMQ Docker images: <a href='https://github.com/Alfresco/alfresco-docker-activemq'>GitHub Repo</a> <a href='https://hub.docker.com/r/alfresco/alfresco-activemq/'>DockerHub Repo</a><p>
+  </li>
+    <li>
+    <h4>Alfresco Benchmark Framework:</h4>
+    <p>The benchmark framework project provides a way to run highly scalable, easy-to-run Java-based load and benchmark tests on an Alfresco instance.</p>
+    <p>It comprises the following: <a href='https://github.com/Alfresco/alfresco-bm-manager'>Alfresco BM Manager</a> and Alfresco BM Drivers.</p> 
+    <p>The currently provided drivers are:</p>
+      <ul>
+        <li><a href='https://github.com/Alfresco/alfresco-bm-load-data'>Alfresco Benchmark Load Data</a></li>
+        <li><a href='https://github.com/Alfresco/alfresco-bm-rest-api'>Alfresco Benchmark Rest Api</a></li>
+        <li><a href='https://github.com/Alfresco/alfresco-bm-load-users'>Alfresco Benchmark Load Users</a></li>
+      </ul>	 
+  </li>
+    <li>
+    <h4>Java 11 support</h4>
+    <p>ACS is now runnable with OpenJDK 11.0.1. It still remains compatible with JDK 1.8.</p>
+  </li>
+</ul>
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22049'>ALF-22049</a>] -         Alfresco does not start
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22041'>ALF-22041</a>] -         EKS deployment - SOLR_ALFRESCO_HOST set to wrong host name
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22031'>ALF-22031</a>] -         REST API calls silently rollback after the returning a success status
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21963'>ALF-21963</a>] -         Workflow - backslash in nodeRef properties url.
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21803'>ALF-21803</a>] -         Unable to add users to sites whose 'short name' is a substring of 'site'
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21664'>ALF-21664</a>] -         Exception on workflow image by REST API
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-20854'>ALF-20854</a>] -         webdav error opening Spanish Accent files
+</li>
+</ul>
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3668'>REPO-3668</a>] -         Renditions: Transform event consumer
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-7'>REPO-7</a>] -         Embed ActiveMQ in the Platform
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-1957'>REPO-1957</a>] -         Transformations Improvement Plan
+</li>
+</ul>
+<h2>
+  Deprecations
+</h2>
+<ul>
+  <li>
+    TransformService and RenditionService: All Java APIs related to TransformService and RenditionService have been deprecated; the ability to perform arbitrary transformations will be phased out as the new DBP Transform Service takes effect.  Renditions can be triggered using the existing repository REST API but will be processed asynchronously using the new services.<br/>
+  </li>
+</ul>
+<h2>
+  Known issues
+</h2>
+<ul>
+  <li>
+    Due to the changes to the RenditionService the Media Management AMP is not supported yet.<br/>
+  </li>
+</ul>
+<h2>
+
+<h1>        Release Notes - Alfresco - Version Community Edition 201810 EA
+</h1>  
+
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21783'>ALF-21783</a>] -         ScriptAuthorityService: No way to get more than 100 results with some methods
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21917'>ALF-21917</a>] -         Document list edit metadata incorrect url escaping
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22001'>ALF-22001</a>] -         Faceted search does not work in Japanese
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22030'>ALF-22030</a>] -         ADF UI freezes noticeably on a periodic basis during KeyCloak auth requests
+</li>
+</ul>                                                                                
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-2491'>REPO-2491</a>] -         Renditions: Rendition Testing
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3651'>REPO-3651</a>] -         AWS Load Tests: Infrastructure and Revamp
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3663'>REPO-3663</a>] -         AWS Load Tests: Initial AWS Cost Estimation with BMF
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3667'>REPO-3667</a>] -         Renditions: Transform event producer
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3677'>REPO-3677</a>] -         AWS Services: Basic Deployment
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3703'>REPO-3703</a>] -         AWS Services: Native Services of ACS
+</li>
+</ul>
+<h2>
+
+<h1>        Release Notes - Alfresco - Version Community Edition 201808 EA
+</h1>                                                                                                                                                                                                                                                            
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21992'>ALF-21992</a>] -         BehaviourFilterImpl.isEnabled(NodeRef, QName) is checking wrong QName in case of subClass
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22006'>ALF-22006</a>] -         VersionServicePolicies cannot be disabled on a specific node
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22007'>ALF-22007</a>] -         TransactionListeners are executed in unpredictable order
+</li>
+</ul>
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22011'>ALF-22011</a>] -         Upgrade to XMLBeans 3.0.0
+</li>
+</ul>
+
+<h1>        Release Notes - Alfresco - Version Community Edition 201806 GA
+</h1>                                                                                                                                                                                                                                                            
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22000'>ALF-22000</a>] -         Docker: HTML link 693ce565f4c4:8080/share but name 
+</li>
+<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22008'>ALF-22008</a>] -         It is not possible to upload a document without versions using CMIS
+</li>
+</ul>

LICENSE

@@ -1,165 +1,191 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
+   1. Definitions.
 
-  0. Additional Definitions.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-  1. Exception to Section 3 of the GNU GPL.
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-  2. Conveying Modified Versions.
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
-  3. Object Code Incorporating Material from Library Header Files.
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
 
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
 
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
 
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
 
-  4. Combined Works.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
 
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
 
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-   d) Do one of the following:
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
 
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
+   END OF TERMS AND CONDITIONS
 
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
+   Copyright 2018 Alfresco Software, Inc. All Rights Reserved.
 
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
+   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
 
-  5. Combined Libraries.
+       http://www.apache.org/licenses/LICENSE-2.0
 
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+   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.

README.md

@@ -7,89 +7,31 @@ The SNAPSHOT version of the artifacts is **never** published.
 ### Contributing guide
 Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
 
-This project contains the code for packaging the entire Alfresco Content Services product Community edition.
+This produces the docker images for alfresco-content-repository-community and the distribution zip for the entire Alfresco Content Services Community product
+
+# General
 
-## General
 ### Build:
 * ```mvn clean install``` in the root of the project will build everything.
 
-## Docker-compose & Kubernetes
-Build and start Alfresco Content Services Community using docker-compose or Kubernetes, containing:
-1. Alfresco Repository for community, with:  
-1.1. Alfresco Share Services amp  
-1.2. Alfresco AOS amp  
-1.3. Alfresco vti-bin war - that helps with AOS integration  
-1.4. Alfresco Google Docs Repo amp  
-2. Alfresco Share, with:  
-2.1 Alfresco Google Docks Share amp  
-3. A Postgres DB  
-4. Alfresco Solr6  
+## Docker Alfresco
+On official releases, the image is published: https://hub.docker.com/r/alfresco/alfresco-content-repository-community/tags/
 
-### Docker Compose Instructions:
-#### Prerequisite: 
-* Docker installed locally 
-* Access to docker-internal.alfresco.com and quay.io repositories - Platform Services team is working on getting the images in [Docker Hub](https://hub.docker.com/u/alfresco/) registry.
-
-#### Steps
-1. Go to **docker-compose** folder
-2. Run ```docker-compose up``` 
-3. Check that everything starts up with the browser: http://localhost:8082/alfresco and http://localhost:8080/share and http://localhost:8083/solr/
-
-#### Notes:
-* Make sure the local machine has the ports (5432, 8080, 8082, 8083) set up in the docker-compose.yml file free.
-* The images used in the docker-compose.yml are images that are build in the 'docker-alfresco' and 'docker-share' subfolders of the project - see the relevant sections below
-* If you don't have access to the docker-internal.alfresco.com and quay.io images, or if you want custom data in your docker images, you can use the 'docker-alfresco' and 'docker-share' folders to customize and build your customized docker images that are used in the docker-compose project. Just make sure you use proper tags when you create the images and update the docker-compose.yml with these proper tags that you created.
-
-### Kubernetes Instructions:
-#### Prerequisite: 
-* Deploy the infrastructure chart as specified in https://github.com/Alfresco/alfresco-infrastructure-deployment
-* Access to docker-internal.alfresco.com and quay.io repositories - Platform Services team is working on getting the images in [Docker Hub](https://hub.docker.com/u/alfresco/) registry.
-* A kubernetes secret (quay-registry-secret) with the above mentioned credentials created in your cluster.
-
-**Note!** You do not need to pull this repo in order to deploy Alfresco Content Services in Kubernetes
-
-#### Steps
-1. Run ```helm repo add alfresco-incubator http://kubernetes-charts.alfresco.com/incubator``` to add the Alfresco Kubernetes repository to helm.
-2. Deploy Alfresco Content Services:
-
-```bash
-#On MINIKUBE
-helm install alfresco-incubator/alfresco-content-services \
---set dnsaddress="http://$ELBADDRESS:$INFRAPORT" \
---namespace=$DESIREDNAMESPACE
-#On AWS
-helm install alfresco-incubator/alfresco-content-services \
---set dnsaddress="http://$ELBADDRESS" \
---namespace=$DESIREDNAMESPACE
-``` 
-
-3. After deploying the helm chart you will get information for obtaining the URL for repository, share and solr.
-
-#### Notes:
-
-* The images used in the alfresco-content-services/values.yml are images that are built in the 'docker-alfresco' and 'docker-share' subfolders of the project - see the relevant sections below.
-* If you don't have access to the docker-internal.alfresco.com and quay.io images, or if you want custom data in your docker images, you can use the 'docker-alfresco' and 'docker-share' folders to customize and build your customized docker images that are used in the docker-compose project. Just make sure you build them in the minikube docker environment and update the alfresco-content-services/values.yml with the tags that you created.
-* You can also change those values when deploying the helm chart by running ```helm install alfresco-incubator/alfresco-content-services --set repository.image.tag="yourTag" --set share.image.tag="yourTag"```.
-* Hint: Run  ```eval $(minikube docker-env)``` to switch to your minikube docker environment on osx.
-
-## Docker images
-These images are used to build the images used by the docker-compose.yml project to bring up an ACS Community, similar to what the installer did/does.  
-
-### Docker Alfresco
-1. Go to docker-alfreco folder
+For testing locally:
+1. Go to docker-alfresco folder
 2. Run *mvn clean install* if you have not done so
-3. Build the docker image: ```docker build . --tag my-acs-repo:6.0.test```
-4. Check that the image has been created locally with your desired name/tag: ```docker images```
-
-### Docker Share
-1. Go to docker-share folder
-2. Run *mvn clean install* if you have not done so
-3. Build the docker image: ```docker build . --tag my-share:5.2.test```
+3. Build the docker image: ```docker build . --tag acr-community:6.0.tag```
 4. Check that the image has been created locally with your desired name/tag: ```docker images```
 
+### Docker-compose & Kubernetes
+Use the deployment project if you want the sample docker-compose or helm: https://github.com/Alfresco/acs-community-deployment
 
 ## Distribution zip
+In this folder the distribution zip is build. It contains all the war files, libraries, certificates and settings files you need to deploy Alfresco Content Services Community on the supported application servers.
 
-In this folder the distribution zip is build. It contains all the war files, libraries, certificates and settings files you need to deploy alfresco on the supported application servers.
-
+## How to
 
+* [Create a custom Docker image](https://github.com/Alfresco/acs-packaging/blob/master/docs/create-custom-image.md)
+* [Creating customized Docker images using an existing Docker image](https://github.com/Alfresco/acs-packaging/blob/master/docs/create-custom-image-using-existing-docker-image.md)
+* [Verifying that AMPs have been applied](https://github.com/Alfresco/acs-packaging/blob/master/docs/verify-the-amp-has-been-applied.md)
+* [Create and configure custom Transforms](https://github.com/Alfresco/acs-packaging/blob/master/docs/custom-transforms-and-renditions.md)

distribution/pom.xml

@@ -1,40 +1,60 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-content-services-community-full-distribution</artifactId>
-    <name>Alfresco Content Services Community Full Distribution zip</name>
+    <artifactId>alfresco-content-services-community-distribution</artifactId>
+    <name>Alfresco Content Services Community Distribution zip</name>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.4-ea</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>7.0.0-TEST4</version>
     </parent>
 
     <dependencies>
+        <!-- WAR files -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-content-services-community-distribution</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>content-services-community</artifactId>
+            <type>war</type>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-solr4-distribution</artifactId>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>alfresco-repository</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-data-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-server-root</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-mmt</artifactId>
+        </dependency>
+        <!-- 3rd party libs -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${dependency.postgresql.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- Alfresco Pdf Renderer -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-pdf-renderer</artifactId>
+            <classifier>linux</classifier>
+            <type>tgz</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-pdf-renderer</artifactId>
+            <classifier>win64</classifier>
+            <type>tgz</type>
+        </dependency>
+        <!-- SHARE Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-content-services-share-distribution</artifactId>
@@ -49,7 +69,7 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}-${installer.version.name}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -68,17 +88,13 @@
                         </goals>
                         <configuration>
                             <artifactItems>
+                                <!-- Extract keystore from alfresco-repository -->
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-content-services-community-distribution</artifactId>
-                                    <type>zip</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-solr4-distribution</artifactId>
-                                    <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
+                                    <artifactId>alfresco-repository</artifactId>
+                                    <includes>alfresco/keystore/**</includes>
                                 </artifactItem>
+
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-content-services-share-distribution</artifactId>
@@ -87,6 +103,72 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>extract-jlan-dll</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-jlan-embed</artifactId>
+                                    <classifier>windll</classifier>
+                                    <includes>*.dll</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+
+                    <!-- Copy ROOT.war -->
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-server-root</artifactId>
+                                    <type>war</type>
+                                    <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
+                                    <destFileName>ROOT.war</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.alfresco.aos-module</groupId>
+                                    <artifactId>alfresco-vti-bin</artifactId>
+                                    <type>war</type>
+                                    <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
+                                    <destFileName>_vti_bin.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+
+                    <!-- Copy ROOT.war -->
+                    <execution>
+                        <id>copy-alfresco-war</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>content-services-community</artifactId>
+                                    <version>${dependency.alfresco-community-repo.version}</version>
+                                    <type>war</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <destFileName>alfresco.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 
@@ -102,7 +184,7 @@
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
-                                <descriptor>src/assembly/full-distribution.xml</descriptor>
+                                <descriptor>src/assembly/distribution.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>

distribution/src/assembly/distribution.xml

@@ -1,6 +1,8 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>warinstallation</id>
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>distribution</id>
+
+
     <formats>
         <format>zip</format>
     </formats>
@@ -29,13 +31,20 @@
                 <include>*.dll</include>
             </includes>
         </fileSet>
-        <!-- Empty endorsed folder -->
+
+        <!-- Share -->
         <fileSet>
-            <directory>src/assembly</directory>
-            <outputDirectory>web-server/endorsed</outputDirectory>
-            <excludes>
-                <exclude>*</exclude>
-            </excludes>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
+            <outputDirectory/>
+            <includes>
+                <include>web-server/**</include>
+                <include>modules/**</include>
+                <include>amps/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
+            <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
         </fileSet>
     </fileSets>
 

distribution/src/assembly/full-distribution.xml

@@ -1,56 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>distribution</id>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <!-- Local resources: README, etc. -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-
-        <!-- Platform Community Distribution -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${project.version}</directory>
-            <outputDirectory/>
-        </fileSet>
-
-        <!-- Solr4 Distribution -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/solr4</directory>
-            <outputDirectory>solr4</outputDirectory>
-            <excludes>
-                <exclude>solr4.war</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/solr4</directory>
-            <outputDirectory>web-server/webapps</outputDirectory>
-            <includes>
-                <include>solr4.war</include>
-            </includes>
-        </fileSet>
-
-        <!-- Share -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
-            <outputDirectory/>
-            <includes>
-                <include>web-server/**</include>
-		<include>modules/**</include>
-		<include>amps/**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
-            <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-</assembly>

distribution/src/main/resources/README.txt

@@ -1,8 +1,9 @@
-Alfresco Community (Build: ${installer.version.name})
-===============================
-
-Contains:
-	- Alfresco Content Services Community:	${project.version}
-	- Alfresco Share:		${alfresco.share.version}
-
-For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm
+Alfresco Community (Build: ${installer.version.name})
+===============================
+
+Contains:
+	- Alfresco Content Services Community:	${project.version}
+	- Alfresco Repository:	${dependency.alfresco-community-repo.version}
+	- Alfresco Share:		${alfresco.share.version}
+
+For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm

distribution/src/main/resources/keystore/CreateSSLKeystores.txt

@@ -0,0 +1,141 @@
+Instructions for Generating Repository SSL Keystores
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+<store password> is the keystore password. The file ${dir.keystore}/ssl-keystore-passwords.properties contains passwords for the SSL keystore,
+${dir.keystore}/ssl-truststore-passwords.properties contains passwords for the SSL truststore.
+
+These instructions will create an RSA public/private key pair for the repository with a certificate that has been signed by the Alfresco Certificate Authority (CA).
+It will also create a truststore for the repository containing the CA certificate; this will be used to authenticate connections to specific repository
+URLs from Solr. It assumes the existence of the Alfresco CA key and certificate to sign the repository certificate; for security reasons these are not generally available.
+You can either generate your own CA key and certificate (see instructions below) or use a recognised Certificate Authority such as Verisign. For Alfresco employees the key
+and certificate are available in svn.
+
+(i) Generate the repository public/private key pair in a keystore:
+
+$ keytool -genkey -alias ssl.repo -keyalg RSA -keystore ssl.keystore -storetype JCEKS -storepass <store password>
+Enter keystore password:  
+Re-enter new password: 
+What is your first and last name?
+  [Unknown]:  Alfresco Repository
+What is the name of your organizational unit?
+  [Unknown]:  
+What is the name of your organization?
+  [Unknown]:  Alfresco Software Ltd.
+What is the name of your City or Locality?
+  [Unknown]:  Maidenhead 
+What is the name of your State or Province?
+  [Unknown]:  UK
+What is the two-letter country code for this unit?
+  [Unknown]:  GB
+Is CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB correct?
+  [no]:  yes
+
+Enter key password for <ssl.repo>
+	(RETURN if same as keystore password):  
+	
+(ii) Generate a certificate request for the repository key
+
+$ keytool -keystore ssl.keystore -alias ssl.repo -certreq -file repo.csr -storetype JCEKS -storepass <store password>
+
+(iii) Alfresco CA signs the certificate request, creating a certificate that is valid for 365 days.
+
+$ openssl x509 -CA ca.crt -CAkey ca.key -CAcreateserial -req -in repo.csr -out repo.crt -days 365
+Signature ok
+subject=/C=GB/ST=UK/L=Maidenhead/O=Alfresco Software Ltd./OU=Unknown/CN=Alfresco Repository
+Getting CA Private Key
+Enter pass phrase for ca.key:
+
+(iv) Import the Alfresco CA key into the repository key store
+
+$ keytool -import -alias ssl.alfreco.ca -file ca.crt -keystore ssl.keystore -storetype JCEKS -storepass <store password>
+Enter keystore password:  
+Owner: CN=Alfresco CA, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB
+Issuer: CN=Alfresco CA, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB
+Serial number: 805ba6dc8f62f8b8
+Valid from: Fri Aug 12 13:28:58 BST 2011 until: Mon Aug 09 13:28:58 BST 2021
+Certificate fingerprints:
+	 MD5:  4B:45:94:2D:8E:98:E8:12:04:67:AD:AE:48:3C:F5:A0
+	 SHA1: 74:42:22:D0:52:AD:82:7A:FD:37:46:37:91:91:F4:77:89:3A:C9:A3
+	 Signature algorithm name: SHA1withRSA
+	 Version: 3
+
+Extensions: 
+
+#1: ObjectId: 2.5.29.14 Criticality=false
+SubjectKeyIdentifier [
+KeyIdentifier [
+0000: 08 42 40 DC FE 4A 50 87   05 2B 38 4D 92 70 8E 51  .B@..JP..+8M.p.Q
+0010: 4E 38 71 D6                                        N8q.
+]
+]
+
+#2: ObjectId: 2.5.29.19 Criticality=false
+BasicConstraints:[
+  CA:true
+  PathLen:2147483647
+]
+
+#3: ObjectId: 2.5.29.35 Criticality=false
+AuthorityKeyIdentifier [
+KeyIdentifier [
+0000: 08 42 40 DC FE 4A 50 87   05 2B 38 4D 92 70 8E 51  .B@..JP..+8M.p.Q
+0010: 4E 38 71 D6                                        N8q.
+]
+
+[CN=Alfresco CA, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB]
+SerialNumber: [    805ba6dc 8f62f8b8]
+]
+
+Trust this certificate? [no]:  yes
+Certificate was added to keystore
+
+(v) Import the CA-signed repository certificate into the repository keystore
+
+$ keytool -import -alias ssl.repo -file repo.crt -keystore ssl.keystore -storetype JCEKS -storepass <store password>
+Enter keystore password:  
+Certificate reply was installed in keystore
+
+(vi) Convert the repository keystore to a pkcs12 keystore (for use in browsers such as Firefox). Give the pkcs12 key store the key store password 'alfresco'.
+
+keytool -importkeystore -srckeystore ssl.keystore -srcstorepass <keystore password> -srcstoretype JCEKS -srcalias ssl.repo -srckeypass kT9X6oe68t -destkeystore firefox.p12 -deststoretype pkcs12 -deststorepass alfresco -destalias ssl.repo -destkeypass alfresco
+
+(vi) Create a repository truststore containing the Alfresco CA certificate
+
+keytool -import -alias ssl.alfreco.ca -file ca.crt -keystore ssl.keystore -storetype JCEKS -storepass <store password>
+keytool -import -alias alfreco.ca -file ca.crt -keystore ssl.truststore -storetype JCEKS -storepass <store password>
+
+(vii) Copy the keystore and truststore to the repository keystore location defined by the property 'dir.keystore'.
+(viii) Update the SSL properties i.e. properties starting with the prefixes 'alfresco.encryption.ssl.keystore' and 'alfresco.encryption.ssl.truststore'.
+
+Instructions for Generating a Certificate Authority (CA) Key and Certificate
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+(i) Generate the CA private key
+
+$ openssl genrsa -des3 -out ca.key 1024
+Generating RSA private key, 1024 bit long modulus
+..........++++++
+..++++++
+e is 65537 (0x10001)
+Enter pass phrase for ca.key:
+Verifying - Enter pass phrase for ca.key:
+
+(ii) Generate the CA self-signed certificate
+
+$ openssl req -new -x509 -days 3650 -key ca.key -out ca.crt
+Enter pass phrase for ca.key:
+You are about to be asked to enter information that will be incorporated
+into your certificate request.
+What you are about to enter is what is called a Distinguished Name or a DN.
+There are quite a few fields but you can leave some blank
+For some fields there will be a default value,
+If you enter '.', the field will be left blank.
+-----
+Country Name (2 letter code) [AU]:GB
+State or Province Name (full name) [Some-State]:UK
+Locality Name (eg, city) []:Maidenhead
+Organization Name (eg, company) [Internet Widgits Pty Ltd]:Alfresco Software Ltd.
+Organizational Unit Name (eg, section) []:
+Common Name (eg, YOUR name) []:Alfresco CA
+Email Address []:
+

distribution/src/main/resources/keystore/generate_keystores.bat

@@ -0,0 +1,58 @@
+@rem Please edit the variables below to suit your installation
+@rem Note: for an installation created by the Alfresco installer, you only need to edit ALFRESCO_HOME
+
+@rem Alfresco installation directory
+set ALFRESCO_HOME=C:\Alfresco-5.2
+@rem The directory containing the alfresco keystores, as referenced by keystoreFile and truststoreFile attributes in tomcat\conf\server.xml
+set ALFRESCO_KEYSTORE_HOME=%ALFRESCO_HOME%\alf_data\keystore
+@rem Java installation directory
+set JAVA_HOME=%ALFRESCO_HOME%\java
+@rem Location in which new keystore files will be generated
+set CERTIFICATE_HOME=%USERPROFILE%
+@rem The repository server certificate subject name, as specified in tomcat\conf\tomcat-users.xml with roles="repository"
+set REPO_CERT_DNAME=CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB
+@rem The SOLR client certificate subject name, as specified in tomcat\conf\tomcat-users.xml with roles="repoclient"
+set SOLR_CLIENT_CERT_DNAME=CN=Alfresco Repository Client, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB
+@rem The number of days before the certificate expires
+set CERTIFICATE_VALIDITY=36525
+
+@rem Ensure certificate output dir exists
+@if not exist "%CERTIFICATE_HOME%" mkdir "%CERTIFICATE_HOME%"
+
+@rem Remove old output files (note they are backed up elsewhere)
+@if exist "%CERTIFICATE_HOME%\ssl.keystore" del "%CERTIFICATE_HOME%\ssl.keystore"
+@if exist "%CERTIFICATE_HOME%\ssl.truststore" del "%CERTIFICATE_HOME%\ssl.truststore"
+@if exist "%CERTIFICATE_HOME%\browser.p12" del "%CERTIFICATE_HOME%\browser.p12"
+@if exist "%CERTIFICATE_HOME%\ssl.repo.client.keystore" del "%CERTIFICATE_HOME%\ssl.repo.client.keystore"
+@if exist "%CERTIFICATE_HOME%\ssl.repo.client.truststore" del "%CERTIFICATE_HOME%\ssl.repo.client.truststore"
+
+@rem Generate new self-signed certificates for the repository and solr
+"%JAVA_HOME%\bin\keytool" -genkeypair -keyalg RSA -dname "%REPO_CERT_DNAME%" -validity %CERTIFICATE_VALIDITY% -alias ssl.repo -keypass kT9X6oe68t -keystore "%CERTIFICATE_HOME%\ssl.keystore" -storetype JCEKS -storepass kT9X6oe68t
+"%JAVA_HOME%\bin\keytool" -exportcert -alias ssl.repo -file "%CERTIFICATE_HOME%\ssl.repo.crt" -keystore "%CERTIFICATE_HOME%\ssl.keystore" -storetype JCEKS -storepass kT9X6oe68t
+"%JAVA_HOME%\bin\keytool" -genkeypair -keyalg RSA -dname "%SOLR_CLIENT_CERT_DNAME%" -validity %CERTIFICATE_VALIDITY% -alias ssl.repo.client -keypass kT9X6oe68t -keystore "%CERTIFICATE_HOME%\ssl.repo.client.keystore" -storetype JCEKS -storepass kT9X6oe68t
+"%JAVA_HOME%\bin\keytool" -exportcert -alias ssl.repo.client -file "%CERTIFICATE_HOME%\ssl.repo.client.crt" -keystore "%CERTIFICATE_HOME%\ssl.repo.client.keystore" -storetype JCEKS -storepass kT9X6oe68t
+
+@rem Create trust relationship between repository and solr
+"%JAVA_HOME%\bin\keytool" -importcert -noprompt -alias ssl.repo.client -file "%CERTIFICATE_HOME%\ssl.repo.client.crt" -keystore "%CERTIFICATE_HOME%\ssl.truststore" -storetype JCEKS -storepass kT9X6oe68t
+@rem Create trust relationship between repository and itself - used for searches
+"%JAVA_HOME%\bin\keytool" -importcert -noprompt -alias ssl.repo -file "%CERTIFICATE_HOME%\ssl.repo.crt" -keystore "%CERTIFICATE_HOME%\ssl.truststore" -storetype JCEKS -storepass kT9X6oe68t
+@rem Create trust relationship between solr and repository
+"%JAVA_HOME%\bin\keytool" -importcert -noprompt -alias ssl.repo -file "%CERTIFICATE_HOME%\ssl.repo.crt" -keystore "%CERTIFICATE_HOME%\ssl.repo.client.truststore" -storetype JCEKS -storepass kT9X6oe68t
+@rem Export repository keystore to pkcs12 format for browser compatibility
+"%JAVA_HOME%\bin\keytool" -importkeystore -srckeystore "%CERTIFICATE_HOME%\ssl.keystore" -srcstorepass kT9X6oe68t -srcstoretype JCEKS -srcalias ssl.repo -srckeypass kT9X6oe68t -destkeystore "%CERTIFICATE_HOME%\browser.p12" -deststoretype pkcs12 -deststorepass alfresco -destalias ssl.repo -destkeypass alfresco
+
+@rem Ensure keystore dir actually exists
+@if not exist "%ALFRESCO_KEYSTORE_HOME%" mkdir "%ALFRESCO_KEYSTORE_HOME%"
+
+@rem Install the new files
+copy /Y "%CERTIFICATE_HOME%\ssl.keystore" "%ALFRESCO_KEYSTORE_HOME%\ssl.keystore"
+copy /Y "%CERTIFICATE_HOME%\ssl.truststore" "%ALFRESCO_KEYSTORE_HOME%\ssl.truststore"
+copy /Y "%CERTIFICATE_HOME%\browser.p12" "%ALFRESCO_KEYSTORE_HOME%\browser.p12"
+
+@echo ****************************************
+@echo You must copy the following files to the correct location.
+@echo %CERTIFICATE_HOME%\ssl.repo.client.keystore
+@echo %CERTIFICATE_HOME%\ssl.repo.client.truststore
+@echo eg. for Solr 4 the location is SOLR_HOME\workspace-SpacesStore\conf and SOLR_HOME\archive-SpacesStore\conf  
+@echo Please ensure that you set dir.keystore=%ALFRESCO_KEYSTORE_HOME% in alfresco-global.properties
+@echo ****************************************

distribution/src/main/resources/keystore/generate_keystores.sh

@@ -0,0 +1,82 @@
+#! /bin/sh
+# Please edit the variables below to suit your installation
+# Note: for an installation created by the Alfresco installer, you only need to edit ALFRESCO_HOME
+
+# Alfresco installation directory
+if [ -z "$ALFRESCO_HOME" ]; then
+    ALFRESCO_HOME=/opt/alfresco-5.2
+    echo "Setting ALFRESCO_HOME to $ALFRESCO_HOME"
+fi
+
+# The directory containing the alfresco keystores, as referenced by keystoreFile and truststoreFile attributes in tomcat/conf/server.xml
+ALFRESCO_KEYSTORE_HOME=$ALFRESCO_HOME/alf_data/keystore
+
+# Location in which new keystore files will be generated
+if [ -z "$CERTIFICATE_HOME" ]; then
+    CERTIFICATE_HOME=$HOME
+    echo "Certificates will be generated in $CERTIFICATE_HOME and then moved to $ALFRESCO_KEYSTORE_HOME"
+fi
+
+# Java installation directory
+JAVA_HOME=$ALFRESCO_HOME/java
+
+# The repository server certificate subject name, as specified in tomcat/conf/tomcat-users.xml with roles="repository"
+REPO_CERT_DNAME="CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB"
+# The SOLR client certificate subject name, as specified in tomcat/conf/tomcat-users.xml with roles="repoclient"
+SOLR_CLIENT_CERT_DNAME="CN=Alfresco Repository Client, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB"
+# The number of days before the certificate expires
+CERTIFICATE_VALIDITY=36525
+
+# Stop
+if [ -f "$ALFRESCO_HOME/alfresco.sh" ]; then "$ALFRESCO_HOME/alfresco.sh" stop; fi
+
+# Ensure certificate output dir exists
+mkdir -p "$CERTIFICATE_HOME"
+
+# Remove old output files (note they are backed up elsewhere)
+if [ -f "$CERTIFICATE_HOME/ssl.keystore" ]; then rm "$CERTIFICATE_HOME/ssl.keystore"; fi
+if [ -f "$CERTIFICATE_HOME/ssl.truststore" ]; then rm "$CERTIFICATE_HOME/ssl.truststore"; fi
+if [ -f "$CERTIFICATE_HOME/browser.p12" ]; then rm "$CERTIFICATE_HOME/browser.p12"; fi
+if [ -f "$CERTIFICATE_HOME/ssl.repo.client.keystore" ]; then rm "$CERTIFICATE_HOME/ssl.repo.client.keystore"; fi
+if [ -f "$CERTIFICATE_HOME/ssl.repo.client.truststore" ]; then rm "$CERTIFICATE_HOME/ssl.repo.client.truststore"; fi
+
+# Generate new self-signed certificates for the repository and solr
+"$JAVA_HOME/bin/keytool" -genkeypair -keyalg RSA -dname "$REPO_CERT_DNAME" -validity $CERTIFICATE_VALIDITY -alias ssl.repo -keypass kT9X6oe68t -keystore "$CERTIFICATE_HOME/ssl.keystore" -storetype JCEKS -storepass kT9X6oe68t
+"$JAVA_HOME/bin/keytool" -exportcert -alias ssl.repo -file "$CERTIFICATE_HOME/ssl.repo.crt" -keystore "$CERTIFICATE_HOME/ssl.keystore" -storetype JCEKS -storepass kT9X6oe68t
+"$JAVA_HOME/bin/keytool" -genkeypair -keyalg RSA -dname "$SOLR_CLIENT_CERT_DNAME" -validity $CERTIFICATE_VALIDITY -alias ssl.repo.client -keypass kT9X6oe68t -keystore "$CERTIFICATE_HOME/ssl.repo.client.keystore" -storetype JCEKS -storepass kT9X6oe68t
+"$JAVA_HOME/bin/keytool" -exportcert -alias ssl.repo.client -file "$CERTIFICATE_HOME/ssl.repo.client.crt" -keystore "$CERTIFICATE_HOME/ssl.repo.client.keystore" -storetype JCEKS -storepass kT9X6oe68t
+
+# Create trust relationship between repository and solr
+"$JAVA_HOME/bin/keytool" -importcert -noprompt -alias ssl.repo.client -file "$CERTIFICATE_HOME/ssl.repo.client.crt" -keystore "$CERTIFICATE_HOME/ssl.truststore" -storetype JCEKS -storepass kT9X6oe68t
+# Create trust relationship between repository and itself - used for searches
+"$JAVA_HOME/bin/keytool" -importcert -noprompt -alias ssl.repo -file "$CERTIFICATE_HOME/ssl.repo.crt" -keystore "$CERTIFICATE_HOME/ssl.truststore" -storetype JCEKS -storepass kT9X6oe68t
+# Create trust relationship between solr and repository
+"$JAVA_HOME/bin/keytool" -importcert -noprompt -alias ssl.repo -file "$CERTIFICATE_HOME/ssl.repo.crt" -keystore "$CERTIFICATE_HOME/ssl.repo.client.truststore" -storetype JCEKS -storepass kT9X6oe68t
+# Export repository keystore to pkcs12 format for browser compatibility
+"$JAVA_HOME/bin/keytool" -importkeystore -srckeystore "$CERTIFICATE_HOME/ssl.keystore" -srcstorepass kT9X6oe68t -srcstoretype JCEKS -srcalias ssl.repo -srckeypass kT9X6oe68t -destkeystore "$CERTIFICATE_HOME/browser.p12" -deststoretype pkcs12 -deststorepass alfresco -destalias ssl.repo -destkeypass alfresco
+
+# Ensure keystore dir actually exists
+mkdir -p "$ALFRESCO_KEYSTORE_HOME"
+
+# Back up old files
+cp "$ALFRESCO_KEYSTORE_HOME/ssl.keystore" "$ALFRESCO_KEYSTORE_HOME/ssl.keystore.old"
+cp "$ALFRESCO_KEYSTORE_HOME/ssl.truststore" "$ALFRESCO_KEYSTORE_HOME/ssl.truststore.old"
+cp "$ALFRESCO_KEYSTORE_HOME/browser.p12" "$ALFRESCO_KEYSTORE_HOME/browser.p12.old"
+
+# Install the new files
+cp "$CERTIFICATE_HOME/ssl.keystore" "$ALFRESCO_KEYSTORE_HOME/ssl.keystore"
+cp "$CERTIFICATE_HOME/ssl.truststore" "$ALFRESCO_KEYSTORE_HOME/ssl.truststore"
+cp "$CERTIFICATE_HOME/browser.p12" "$ALFRESCO_KEYSTORE_HOME/browser.p12"
+
+echo " "
+echo "*******************************************"
+echo "You must copy the following files to the correct location."
+echo " "
+echo " $CERTIFICATE_HOME/ssl.repo.client.keystore"
+echo " $CERTIFICATE_HOME/ssl.repo.client.truststore"
+echo " eg. for Solr 4 the location is SOLR_HOME/workspace-SpacesStore/conf/ and SOLR_HOME/archive-SpacesStore/conf/"
+echo " "
+echo "$ALFRESCO_KEYSTORE_HOME/browser.p12 has also been generated."
+echo " "
+echo "Please ensure that you set dir.keystore=$ALFRESCO_KEYSTORE_HOME in alfresco-global.properties"
+echo "*******************************************"

distribution/src/main/resources/keystore/readme.txt

@@ -0,0 +1,7 @@
+See https://wiki.alfresco.com/wiki/Data_Encryption and https://wiki.alfresco.com/wiki/Alfresco_And_SOLR.
+
+keystore is the secret key keystore, containing the secret key used to encrypt and decrypt node properties.
+ssl.keystore is the repository keystore, containing the repository private/public key pair and certificate.
+ssl.truststore is the repository truststore, containing certificates that the repository trusts.
+
+browser.p12 is a pkcs12 keystore generated from ssl.keystore that contains the repository private key and certificate for use in browsers such as Firefox.

distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt

@@ -1,13 +1,18 @@
-The authoratitive ImageMagick license can be found at
+The authoritative ImageMagick license can be found at
 http://www.imagemagick.org/script/license.php and ImageMagick notices at
 http://www.imagemagick.org/www/Notice.html.
 
-Before we get to the text of the license lets just review what the license says in simple terms:
+Before we get to the text of the license, lets just review what the license says in simple terms:
 
 It allows you to:
 
     * freely download and use ImageMagick software, in whole or in part, for personal, company internal, or commercial purposes;
-    * use ImageMagick software in packages or distributions that you create.
+    * use ImageMagick software in packages or distributions that you create;
+    * link against a library under a different license;
+    * link code under a different license against a library under this license;
+    * merge code into a work under a different license;
+    * extend patent grants to any code using code under this license;
+    *and extend patent protection.
 
 It forbids you to:
 
@@ -27,39 +32,42 @@ It does not require you to:
 
 A few other clarifications include:
     * ImageMagick is freely available without charge;
-    * you may include ImageMagick on a CD-ROM as long as you comply with the terms of the license;
+    * you may include ImageMagick on any digital media as long as you comply with the terms of the license;
     * you can give modified code away for free or sell it under the terms of the ImageMagick license or distribute the result under a different license, but you need to acknowledge the use of the ImageMagick software;
-    * the license is compatible with the GPL.
+    * the license is compatible with the GPL V3.
+    * when exporting the ImageMagick software, review its export classification.
+
+Terms and Conditions for Use, Reproduction, and Distribution
 
 The legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick follow:
 
-Copyright 1999-2005 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.
+Copyright © 1999-2018 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.
 
 1. Definitions.
 
 "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-  
+
 "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-  
+
 "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-  
+
 "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-  
+
 "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-  
+
 "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-  
+
 "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-  
+
 "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-  
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication intentionally sent to the Licensor by its copyright holder or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-  
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
 "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
 
 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
 
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted.
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
 
 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
 
@@ -82,3 +90,21 @@ You may add Your own copyright statement to Your modifications and may provide a
 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
 
 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+How to Apply the License to your Work
+
+To apply the ImageMagick License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information (don't include the brackets). The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the ImageMagick License (the "License"); you may not use
+   this file except in compliance with the License.  You may obtain a copy
+   of the License at
+
+     https://www.imagemagick.org/script/license.php
+
+   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.

distribution/src/main/resources/licenses/notice.txt

@@ -74,7 +74,6 @@ JSlidesShare    http://code.google.com/p/jslideshare/
 JSON.simple http://code.google.com/p/json-simple/
 jsr107cache http://jsr107cache.sourceforge.net/
 JSR 305 http://findbugs.sourceforge.net/
-jstl    http://tomcat.apache.org/taglibs/index.html
 jug-asl http://jug.safehaus.org/ 
 LESS for Java   http://www.asual.com/lesscss/
 LiveTribe   http://livetribe.codehaus.org/
@@ -113,7 +112,6 @@ xbean   http://geronimo.apache.org/xbean/
 xercesImpl  http://xerces.apache.org/xerces2-j
 XML Commons External Components http://xml.apache.org/commons/components/external/
 XMLBeans    http://xmlbeans.apache.org/
-XML-RPC http://ws.apache.org/xmlrpc/
 XML Schema  http://ws.apache.org/commons/XmlSchema/
 Santuario   http://santuario.apache.org/
 OpenSSL http://www.openssl.org/

distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml

@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Context crossContext="true">
+  <Resources>
+    <PostResources base="${catalina.base}/../modules/platform"
+                   className="org.apache.catalina.webresources.DirResourceSet"
+                   webAppMount="/WEB-INF/lib"/>
+  </Resources>
+</Context>

docker-alfresco/Dockerfile

@@ -1,67 +1,44 @@
-FROM quay.io/alfresco/alfresco-base-tomcat:8.5.28-java-8-oracle-centos-7-f7b1278cc0eb
+FROM alfresco/alfresco-community-repo-base:${upstream.image.tag}
 
-# Base ACS Repository Image includes transformation commands:
-#   /usr/bin/alfresco-pdf-renderer      - alfresco-pdf-renderer
-#   /usr/bin/convert                    - imagemagick
-#   /opt/libreoffice5.4/program/soffice - LibreOffice
+# Set default docker_context. Will / Can be overriden with maven.
+ARG resource_path=target
 
-ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz
-ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/5.4.6/libreoffice-dist-5.4.6-linux.gz
-ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-linux.rpm
-ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-libs-linux.rpm
+# Set default user information
+ARG GROUPNAME=Alfresco
+ARG GROUPID=1000
+ARG IMAGEUSERNAME=alfresco
+ARG USERID=33000
 
-RUN yum install wget -y && \
-	\
-	wget $ALFRESCO_PDF_RENDERER_LIB_RPM_URL && \
-    tar xf alfresco-pdf-renderer-*-linux.tgz -C /usr/bin && \
-    rm -f alfresco-pdf-renderer-*-linux.tgz && \
-    \
-    yum install -y cairo cups-libs libSM && \
-    wget $LIBREOFFICE_RPM_URL && \
-    tar xzf libreoffice-dist-*-linux.gz && \
-    yum localinstall -y LibreOffice*/RPMS/*.rpm && \
-    rm -rf libreoffice-dist-*-linux.gz LibreOffice_*_Linux_x86-64_rpm && \
-    \
-    wget $IMAGEMAGICK_RPM_URL && \
-    wget $IMAGEMAGICK_LIB_RPM_URL && \
-    yum localinstall -y imagemagick-distribution-*-linux.rpm && \
-    rm -f imagemagick-distribution-*-linux.rpm && \
-    \
-    yum clean all &&\
-	\
-	yum remove wget -y
+# Set default environment args
+ARG TOMCAT_DIR=/usr/local/tomcat
 
-RUN mkdir -p /usr/local/tomcat/shared/classes && \
-    mkdir /usr/local/tomcat/alfresco-mmt
+USER root
 
-RUN touch /usr/local/tomcat/shared/classes/alfresco-global.properties
+# Copy api-explorer war
+COPY ${resource_path}/war/* ${TOMCAT_DIR}/webapps/
 
-COPY target/war /usr/local/tomcat/webapps
-COPY target/connector/* /usr/local/tomcat/lib/
-COPY target/alfresco-mmt/* /usr/local/tomcat/alfresco-mmt/
-RUN rm -rf /usr/local/tomcat/webapps/ROOT
-COPY target/server-root/* /usr/local/tomcat/webapps
+# Copy in the share-services amp
+COPY ${resource_path}/amps/* ${TOMCAT_DIR}/amps/
 
-RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" /usr/local/tomcat/conf/catalina.properties
+# Install amps on alfresco.war
+RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \
+              ${TOMCAT_DIR}/amps \
+              ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup
 
-RUN echo -e '\n\
-alfresco-pdf-renderer.root=/usr/bin/\n\
-alfresco-pdf-renderer.exe=${alfresco-pdf-renderer.root}/alfresco-pdf-renderer\n\
-\n\
-jodconverter.enabled=true\n\
-jodconverter.portNumbers=8100\n\
-jodconverter.officeHome=/opt/libreoffice5.4/\n\
-\n\
-img.root=/usr/lib64/ImageMagick-7.0.7\n\
-img.coders=/usr/lib64/ImageMagick-7.0.7/modules-Q16HDRI/coders\n\
-img.config=/usr/lib64/ImageMagick-7.0.7/config-Q16HDRI\n\
-img.exe=/usr/bin/convert\n\
-' >> /usr/local/tomcat/shared/classes/alfresco-global.properties
+# The standard configuration is to have all Tomcat files owned by root with group GROUPNAME and whilst owner has read/write privileges,
+# group only has restricted permissions and world has no permissions.
+RUN chgrp -R ${GROUPNAME} ${TOMCAT_DIR} && \
+    chmod g+rx ${TOMCAT_DIR}/conf && \
+    chmod -R g+r ${TOMCAT_DIR}/conf && \
+    find ${TOMCAT_DIR}/webapps -type d -exec chmod 0750 {} \; && \
+    find ${TOMCAT_DIR}/webapps -type f -exec chmod 0640 {} \; && \
+    chmod -R g+r ${TOMCAT_DIR}/webapps && \
+    chmod g+r ${TOMCAT_DIR}/conf/Catalina && \
+    chmod g+rwx ${TOMCAT_DIR}/alf_data && \
+    chmod g+rwx ${TOMCAT_DIR}/logs && \
+    chmod o-w ${TOMCAT_DIR}/logs && \
+    chmod g+rwx ${TOMCAT_DIR}/temp && \
+    chmod g+rwx ${TOMCAT_DIR}/work && \
+    chmod o-w ${TOMCAT_DIR}/work
 
-RUN mkdir -p /usr/local/tomcat/amps
-
-COPY target/amps /usr/local/tomcat/amps
-
-
-RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
-              /usr/local/tomcat/amps /usr/local/tomcat/webapps/alfresco -directory -nobackup -force
+USER ${IMAGEUSERNAME}

docker-alfresco/pom.xml

@@ -7,131 +7,158 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.4-ea</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>7.0.0-TEST4</version>
     </parent>
 
     <properties>
         <image.name>alfresco/alfresco-content-repository-community</image.name>
-        <image.registry>quay.io</image.registry>
-        <public.image.registry>registry.hub.docker.com</public.image.registry>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-server-root</artifactId>
-            <version>${dependency.alfresco-server-root.version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${dependency.postgresql.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-mmt</artifactId>
-            <version>${dependency.alfresco-mmt.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-share-services</artifactId>
-            <version>${alfresco.alfresco-share-services.version}</version>
-            <type>amp</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco.aos-module</groupId>
-            <artifactId>alfresco-aos-module</artifactId>
-            <version>${alfresco.aos-module.version}</version>
-            <type>amp</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco.aos-module</groupId>
-            <artifactId>alfresco-vti-bin</artifactId>
-            <version>${alfresco.aos-module.version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco.integrations</groupId>
-            <artifactId>alfresco-googledocs-repo</artifactId>
-            <version>${alfresco.googledocs.version}</version>
-            <type>amp</type>
-        </dependency>
-    </dependencies>
+<!--    <dependencies>-->
+<!--        <dependency>-->
+<!--            <groupId>org.alfresco</groupId>-->
+<!--            <artifactId>alfresco-mmt</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.alfresco</groupId>-->
+<!--            <artifactId>alfresco-server-root</artifactId>-->
+<!--            <type>war</type>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.postgresql</groupId>-->
+<!--            <artifactId>postgresql</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.alfresco.aos-module</groupId>-->
+<!--            <artifactId>alfresco-aos-module</artifactId>-->
+<!--            <type>amp</type>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.alfresco.aos-module</groupId>-->
+<!--                    <artifactId>alfresco-aos-repo-binding</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.alfresco.aos-module</groupId>-->
+<!--            <artifactId>alfresco-vti-bin</artifactId>-->
+<!--            <type>war</type>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.alfresco.integrations</groupId>-->
+<!--            <artifactId>alfresco-googledrive-repo-community</artifactId>-->
+<!--            <type>amp</type>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.alfresco</groupId>-->
+<!--            <artifactId>api-explorer</artifactId>-->
+<!--            <version>${dependency.alfresco-api-explorer.version}</version>-->
+<!--            <type>war</type>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.alfresco</groupId>-->
+<!--            <artifactId>alfresco-share-services</artifactId>-->
+<!--            <type>amp</type>-->
+<!--        </dependency>-->
+<!--    </dependencies>-->
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                   <execution>
+                      <id>copy-licenses</id>
+                      <phase>process-resources</phase>
+                      <goals>
+                          <goal>copy-resources</goal>
+                      </goals>
+                      <configuration>
+                          <resources>
+                              <resource>
+                                  <!-- Extract licenses directory -->
+                                  <directory>../distribution/src/main/resources/licenses</directory>
+                                  <filtering>false</filtering>
+                              </resource>
+                          </resources>
+                          <outputDirectory>${project.build.directory}/licenses</outputDirectory>
+                      </configuration>
+                   </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.0.2</version>
                 <executions>
                     <execution>
-                        <id>unpack-resources</id>
+                        <id>unpack-war-files</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
                         <configuration>
                             <artifactItems>
+<!--                                <artifactItem>-->
+<!--                                    <groupId>org.alfresco</groupId>-->
+<!--                                    <artifactId>content-services-community</artifactId>-->
+<!--                                    <type>war</type>-->
+<!--                                    <overWrite>false</overWrite>-->
+<!--                                    <outputDirectory>${project.build.directory}/war/alfresco</outputDirectory>-->
+<!--                                </artifactItem>-->
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>content-services-community</artifactId>
-                                    <version>${project.version}</version>
+                                    <artifactId>api-explorer</artifactId>
+                                    <version>${dependency.alfresco-api-explorer.version}</version>
                                     <type>war</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/war/alfresco</outputDirectory>
-                                    <destFileName>alfresco.war</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-resources-war</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.postgresql</groupId>
-                                    <artifactId>postgresql</artifactId>
-                                    <version>${dependency.postgresql.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/connector</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-mmt</artifactId>
-                                    <version>${dependency.alfresco-mmt.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/alfresco-mmt</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-server-root</artifactId>
-                                    <version>${dependency.alfresco-server-root.version}</version>
-                                    <type>war</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/server-root</outputDirectory>
-                                    <destFileName>ROOT.war</destFileName>
+                                    <outputDirectory>${project.build.directory}/war/api-explorer</outputDirectory>
                                 </artifactItem>
+<!--                                <artifactItem>-->
+<!--                                    <groupId>org.alfresco</groupId>-->
+<!--                                    <artifactId>alfresco-server-root</artifactId>-->
+<!--                                    <version>${dependency.alfresco-server-root.version}</version>-->
+<!--                                    <type>war</type>-->
+<!--                                    <outputDirectory>${project.build.directory}/war/ROOT</outputDirectory>-->
+<!--                                </artifactItem>-->
+<!--                                <artifactItem>-->
+<!--                                    <groupId>org.alfresco.aos-module</groupId>-->
+<!--                                    <artifactId>alfresco-vti-bin</artifactId>-->
+<!--                                    <type>war</type>-->
+<!--                                    <outputDirectory>${project.build.directory}/war/_vti_bin</outputDirectory>-->
+<!--                                </artifactItem>-->
                             </artifactItems>
                         </configuration>
                     </execution>
+<!--                    <execution>-->
+<!--                        <id>copy-jdbc-connectors</id>-->
+<!--                        <phase>process-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <artifactItems>-->
+<!--                                <artifactItem>-->
+<!--                                    <groupId>org.postgresql</groupId>-->
+<!--                                    <artifactId>postgresql</artifactId>-->
+<!--                                    <version>${dependency.postgresql.version}</version>-->
+<!--                                    <type>jar</type>-->
+<!--                                    <overWrite>false</overWrite>-->
+<!--                                    <outputDirectory>${project.build.directory}/connector</outputDirectory>-->
+<!--                                </artifactItem>-->
+<!--                                <artifactItem>-->
+<!--                                    <groupId>org.alfresco</groupId>-->
+<!--                                    <artifactId>alfresco-mmt</artifactId>-->
+<!--                                    <version>${dependency.alfresco-mmt.version}</version>-->
+<!--                                    <type>jar</type>-->
+<!--                                    <overWrite>false</overWrite>-->
+<!--                                    <outputDirectory>${project.build.directory}/alfresco-mmt</outputDirectory>-->
+<!--                                </artifactItem>-->
+<!--                            </artifactItems>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
 
                     <execution>
-                        <id>copy-resources-amps</id>
+                        <id>copy-amps</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy</goal>
@@ -146,56 +173,50 @@
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.build.directory}/amps</outputDirectory>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco.aos-module</groupId>
-                                    <artifactId>alfresco-aos-module</artifactId>
-                                    <version>${alfresco.aos-module.version}</version>
-                                    <type>amp</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco.integrations</groupId>
-                                    <artifactId>alfresco-googledocs-repo</artifactId>
-                                    <version>${alfresco.googledocs.version}</version>
-                                    <type>amp</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>
-                                </artifactItem>
+<!--                                <artifactItem>-->
+<!--                                    <groupId>org.alfresco.aos-module</groupId>-->
+<!--                                    <artifactId>alfresco-aos-module</artifactId>-->
+<!--                                    <type>amp</type>-->
+<!--                                    <overWrite>false</overWrite>-->
+<!--                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
+<!--                                </artifactItem>-->
+<!--                                <artifactItem>-->
+<!--                                    <groupId>org.alfresco.integrations</groupId>-->
+<!--                                    <artifactId>alfresco-googledrive-repo-community</artifactId>-->
+<!--                                    <type>amp</type>-->
+<!--                                    <overWrite>false</overWrite>-->
+<!--                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
+<!--                                </artifactItem>-->
                             </artifactItems>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>fabric8-maven-plugin</artifactId>
-                <version>${dependency.fabric8.version}</version>
-                <configuration>
-                    <images>
-                        <image>
-                            <name>${image.name}:${image.tag}</name>
-                            <registry>${image.registry}</registry>
-                            <build>
-                                <dockerFileDir>${project.basedir}/</dockerFileDir>
-                            </build>
-                        </image>
-                    </images>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
     <profiles>
         <profile>
             <id>communityDocker</id>
+            <!-- builds "image:latest" locally -->
             <build>
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${dependency.fabric8.version}</version>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${image.name}:${image.tag}</name>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <buildOptions>
+                                            <squash>true</squash>
+                                        </buildOptions>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>build-image</id>
@@ -212,12 +233,37 @@
 
         <profile>
             <id>internal</id>
+            <!-- publishes "image:latest" on Quay & DockerHub -->
             <build>
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${dependency.fabric8.version}</version>
+                        <configuration>
+                            <images>
+                                <!-- Quay image -->
+                                <image>
+                                    <name>${image.name}:${image.tag}</name>
+                                    <registry>${image.registry}</registry>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <buildOptions>
+                                            <squash>true</squash>
+                                        </buildOptions>
+                                    </build>
+                                </image>
+                                <!-- DockerHub image -->
+                                <image>
+                                    <name>${image.name}:${image.tag}</name>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <buildOptions>
+                                            <squash>true</squash>
+                                        </buildOptions>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>build-push-image</id>
@@ -235,30 +281,35 @@
 
         <profile>
             <id>release</id>
+            <!-- publishes "image:release_version" on Quay & DockerHub -->
             <build>
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${dependency.fabric8.version}</version>
-                        <configuration>
+                        <configuration combine.self="override">
                             <images>
+                                <!-- Quay image -->
                                 <image>
                                     <name>${image.name}:${project.version}</name>
                                     <registry>${image.registry}</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <buildOptions>
+                                            <squash>true</squash>
+                                        </buildOptions>
                                     </build>
                                 </image>
-                                <!-- Commented out push to dockerhub.
+                                <!-- DockerHub image -->
                                 <image>
                                     <name>${image.name}:${project.version}</name>
-                                    <registry>${public.image.registry}</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <buildOptions>
+                                            <squash>true</squash>
+                                        </buildOptions>
                                     </build>
                                 </image>
-                                -->
                             </images>
                         </configuration>
                         <executions>
@@ -275,8 +326,5 @@
                 </plugins>
             </build>
         </profile>
-
     </profiles>
-
-
-</project>
+</project>

docker-alfresco/test/.env

@@ -1 +0,0 @@
-ALFRESCO_TAG=latest

docker-alfresco/test/docker-compose.yml

@@ -1,52 +0,0 @@
-version: "3"
-
-services:
-    alfresco:
-        image: quay.io/alfresco/alfresco-content-repository-community:${ALFRESCO_TAG}
-        environment:
-            JAVA_OPTS : "
-                -Ddb.driver=org.postgresql.Driver
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-                -Dsolr.host=solr6
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
-                -Dsolr.base.url=/solr
-                -Dindex.subsystem.name=solr6
-                -Dalfresco.restApi.basicAuthScheme=true
-                -Dimap.server.enabled=true
-                -Dftp.enabled=true
-                -Dftp.dataPortFrom=30000
-                -Dftp.dataPortTo=30099
-                -Dcifs.enabled=true
-                "
-        ports:
-            - 8080:8080
-            - 445:445
-            - 143:143
-            - "21:21"
-            - "30000-30099:30000-30099"
-
-    postgres:
-        image: docker.io/library/postgres:9.4.12
-        environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-        ports:
-            - 5432:5432
-
-    solr6:
-        image: quay.io/alfresco/search-services:1.2.0-SNAPSHOT
-        environment:
-            #Solr needs to know how to register itself with Alfresco
-            - SOLR_ALFRESCO_HOST=alfresco
-            - SOLR_ALFRESCO_PORT=8080
-            #Alfresco needs to know how to call solr
-            - SOLR_SOLR_HOST=solr6
-            - SOLR_SOLR_PORT=8983
-            #Create the default alfresco and archive cores
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-        ports:
-            - 8083:8983 #Browser port

docker-compose/docker-compose.yml

@@ -1,50 +0,0 @@
-version: "3"
-
-services:
-    alfresco:
-        image: alfresco/alfresco-content-repository-community:6.0.4-ea
-        environment:
-            JAVA_OPTS : "
-                -Ddb.driver=org.postgresql.Driver
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-                -Dsolr.host=solr6
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
-                -Dsolr.base.url=/solr
-                -Dindex.subsystem.name=solr6
-                "
-        ports:
-            - 8082:8080 #Browser port
-
-    share:
-        image: alfresco/alfresco-share:6.0.a
-        environment:
-            - REPO_HOST=alfresco
-            - REPO_PORT=8080
-        ports:
-            - 8080:8080
-
-    postgres:
-        image: postgres:9.4.12
-        environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-        ports:
-            - 5432:5432
-
-    solr6:
-        image: alfresco/alfresco-search-services:1.1.0
-        environment:
-            #Solr needs to know how to register itself with Alfresco
-            - SOLR_ALFRESCO_HOST=alfresco
-            - SOLR_ALFRESCO_PORT=8080
-            #Alfresco needs to know how to call solr
-            - SOLR_SOLR_HOST=solr6
-            - SOLR_SOLR_PORT=8983
-            #Create the default alfresco and archive cores
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-        ports:
-            - 8083:8983 #Browser port

helm/alfresco-content-services-community/.helmignore

@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj

helm/alfresco-content-services-community/Chart.yaml

@@ -1,13 +0,0 @@
-name: alfresco-content-services
-version: 0.0.1
-description: A Helm chart for deploying Alfresco Content Services
-keywords:
-- content
-- content services
-- alfresco
-- community
-- alfresco community
-home: https://www.alfresco.com
-sources:
-- https://github.com/Alfresco/acs-community-full-packaging/tree/master/helm
-icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4

helm/alfresco-content-services-community/requirements.yaml

@@ -1,6 +0,0 @@
-
-dependencies:
-- name: postgresql
-  version: 0.8.5
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: postgresql.enabled

helm/alfresco-content-services-community/templates/NOTES.txt

@@ -1,16 +0,0 @@
-
-{{ if .Values.dnsaddress }}
-
-You can access all components of Alfresco Content Services using the same root address, but different paths as follows:
-
-  Content: {{ .Values.dnsaddress }}/alfresco
-  Share: {{ .Values.dnsaddress }}/share
-  Solr: {{ .Values.dnsaddress }}/solr
-
-{{ else }}
-
-If you have a specific DNS address for the cluster please run the following commands to get the application paths:
-
-helm upgrade --reuse-values {{ .Release.Name }} --set dnsaddress="Your DNS address ex: http://myenv.com" alfresco-incubator/alfresco-content-services
-
-{{ end }}

helm/alfresco-content-services-community/templates/_helpers.tpl

@@ -1,53 +0,0 @@
-{{/*
-Create a default fully qualified name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "content-services.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Get the Database hostname depending on the Database type
-*/}}
-{{- define "database.hostname" -}}
-{{- if eq ( .Values.database.type | toString ) "postgresql" }}
-{{- printf "%s-%s" .Release.Name .Values.postgresql.nameOverride -}}
-{{- end }}
-{{- end -}}
-
-{{/*
-Get the Database port depending on the Database type
-*/}}
-{{- define "database.port" -}}
-{{- if eq ( .Values.database.type | toString ) "postgresql" }}
-{{- print .Values.postgresql.service.port -}}
-{{- end }}
-{{- end -}}
-
-{{/*
-Create the Database driver depending on the Database type
-*/}}
-{{- define "database.driver" -}}
-{{- if eq ( .Values.database.type | toString ) "postgresql" }}
-{{- print .Values.postgresql.driver -}}
-{{- end }}
-{{- end -}}
-
-{{/*
-Get the Database user depending on the Database type
-*/}}
-{{- define "database.user" -}}
-{{- if eq ( .Values.database.type | toString ) "postgresql" }}
-{{- print .Values.postgresql.postgresUser -}}
-{{- end }}
-{{- end -}}
-
-{{/*
-Get the Database password depending on the Database type
-*/}}
-{{- define "database.password" }}
-{{- if eq ( .Values.database.type | toString ) "postgresql" -}}
-{{- print .Values.postgresql.postgresPassword -}}
-{{- end }}
-{{- end -}}

helm/alfresco-content-services-community/templates/config-repository.yaml

@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "content-services.fullname" . }}-repository-configmap
-  labels:
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-data:
-  {{- if .Values.repository.environment }}
-  {{- range $key, $val := .Values.repository.environment }}
-  {{ $key }}: {{ $val | quote }}
-  {{- end }}
-  {{- end }}
-  RELEASE_NAME: {{ .Release.Name }}
-  CATALINA_OPTS: "-Dalfresco.host={{ template "content-services.fullname" . }}-repository
-      -Dalfresco.port={{ .Values.repository.service.externalPort }}
-      -Dshare.host={{ template "content-services.fullname" . }}-share
-      -Dshare.port={{ .Values.share.service.externalPort }}
-      -Ddb.driver={{ template "database.driver" . }}
-      -Ddb.username={{ template "database.user" . }}
-      -Ddb.password={{ template "database.password" . }}
-      -Ddb.url=jdbc:{{ .Values.database.type }}://{{ template "database.hostname" . }}:{{ template "database.port" . }}/{{ .Values.postgresql.postgresDatabase }}
-      -Dsolr.host={{ template "content-services.fullname" . }}-solr
-      -Dsolr.port={{ .Values.solr.service.externalPort }}"

helm/alfresco-content-services-community/templates/config-share.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "content-services.fullname" . }}-share-configmap
-  labels:
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-data:
-  REPO_HOST: "{{ template "content-services.fullname" . }}-repository"
-  REPO_PORT: "{{ .Values.repository.service.externalPort }}"

helm/alfresco-content-services-community/templates/config-solr.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "content-services.fullname" . }}-solr-configmap
-  labels:
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-data:
-  SOLR_ALFRESCO_HOST: "{{ template "content-services.fullname" . }}-repository"
-  SOLR_ALFRESCO_PORT: "{{ .Values.repository.service.externalPort }}"
-  SOLR_SOLR_HOST: "{{ template "content-services.fullname" . }}-solr"
-  SOLR_SOLR_PORT: "{{ .Values.solr.image.internalPort }}"
-  {{- if .Values.solr.environment }}
-  {{- range $key, $val := .Values.solr.environment }}
-  {{ $key }}: {{ $val | quote }}
-  {{- end }}
-  {{- end }}