Add support for Alfresco 23+ and migrate to latest official SDK #1

.gitignore

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

README.md

@@ -1,32 +1,46 @@
-# uploader-plus - an Alfresco uploader that prompts for metadata.
-
-A plugin that enhances the standard Alfresco uploader with a mechanism to prompt
-the user for content type and metadata during the upload process.
-
-![upload-metadata-620x494](https://github.com/softwareloop/uploader-plus/wiki/images/home/upload-metadata-620x494.png)
-
-Documentation:
-
-* [Introduction](https://github.com/softwareloop/uploader-plus/wiki)
-* [Installation](https://github.com/softwareloop/uploader-plus/wiki/Installation)
-* [Configuration](https://github.com/softwareloop/uploader-plus/wiki/Configuration)
-* [Working with custom content types](https://github.com/softwareloop/uploader-plus/wiki/Working-with-custom-content-types)
-* [Compatibility tests](https://github.com/softwareloop/uploader-plus/wiki/Compatibility-tests)
-* [Working with Maven](https://github.com/softwareloop/uploader-plus/wiki/Working-with-Maven)
-
-Maintainers:
-
-* [Paolo Predonzani](https://github.com/softwareloop)
-* [Douglas C. R. Paes](https://github.com/douglascrp)
-* [Younes Regaieg](https://github.com/yregaieg)
-
-Contributors:
-
-* [Axel Faust](https://github.com/AFaust)
-* [Stéphane Prouvez](https://github.com/sprouvez)
-* [Oksana Kurysheva](https://github.com/aviriel)
-* [Magnus Pedersen](https://github.com/magp3)
-* [Alexander Mahabir](https://github.com/alex4u2nv)
-* [Roxana Angheluta](https://github.com/anghelutar)
-* [tomasrgar](https://github.com/tomasrgar)
-* [Tom Vandepoele](https://github.com/tom-vandepoele)
+# Alfresco AIO Project - SDK 4.9
+
+This is an All-In-One (AIO) project for Alfresco SDK 4.9.
+
+Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
+
+ * Runs Alfresco Content Service (ACS)
+ * Runs Alfresco Share
+ * Runs Alfresco Search Service (ASS)
+ * Runs PostgreSQL database
+ * Deploys the JAR assembled modules
+
+All the services of the project are now run as docker containers. The run script offers the next tasks:
+
+ * `build_start`. Build the whole project, recreate the ACS and Share docker images, start the dockerised environment composed by ACS, Share, ASS and 
+ PostgreSQL and tail the logs of all the containers.
+ * `build_start_it_supported`. Build the whole project including dependencies required for IT execution, recreate the ACS and Share docker images, start the 
+ dockerised environment composed by ACS, Share, ASS and PostgreSQL and tail the logs of all the containers.
+ * `start`. Start the dockerised environment without building the project and tail the logs of all the containers.
+ * `stop`. Stop the dockerised environment.
+ * `purge`. Stop the dockerised container and delete all the persistent data (docker volumes).
+ * `tail`. Tail the logs of all the containers.
+ * `reload_share`. Build the Share module, recreate the Share docker image and restart the Share container.
+ * `reload_acs`. Build the ACS module, recreate the ACS docker image and restart the ACS container.
+ * `build_test`. Build the whole project, recreate the ACS and Share docker images, start the dockerised environment, execute the integration tests from the
+ `integration-tests` module and stop the environment.
+ * `test`. Execute the integration tests (the environment must be already started).
+
+# Few things to notice
+
+ * No parent pom
+ * No WAR projects, the jars are included in the custom docker images
+ * No runner project - the Alfresco environment is now managed through [Docker](https://www.docker.com/)
+ * Standard JAR packaging and layout
+ * Works seamlessly with Eclipse and IntelliJ IDEA
+ * JRebel for hot reloading, JRebel maven plugin for generating rebel.xml [JRebel integration documentation]
+ * AMP as an assembly
+ * Persistent test data through restart thanks to the use of Docker volumes for ACS, ASS and database data
+ * Integration tests module to execute tests against the final environment (dockerised)
+ * Resources loaded from META-INF
+ * Web Fragment (this includes a sample servlet configured via web fragment)
+
+# TODO
+
+  * Abstract assembly into a dependency so we don't have to ship the assembly in the archetype
+  * Functional/remote unit tests

docker/docker-compose.yml

@@ -0,0 +1,78 @@
+version: '3.4'
+services:
+  uploader-plus-share:
+    image: alfresco-share-uploader-plus:development
+    build:
+      dockerfile: ./Dockerfile
+      context: ../../../uploader-plus-share-docker/target
+    environment:
+      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
+      REPO_HOST: uploader-plus-acs
+      REPO_PORT: 8080
+    ports:
+      - "${share.port}:8080"
+      - "${share.debug.port}:8888"
+  uploader-plus-acs:
+    image: alfresco-content-services-uploader-plus:development
+    build:
+      dockerfile: ./Dockerfile
+      context: ../../../uploader-plus-platform-docker/target
+    environment:
+      JAVA_TOOL_OPTIONS: "${keystore.settings}"
+      JAVA_OPTS: "
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
+        -Dmessaging.broker.url=\"failover:(nio://uploader-plus-activemq:61616)?timeout=3000&jms.useCompression=true\"
+        "
+      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
+    ports:
+      - "${acs.port}:8080"
+      - "${acs.debug.port}:8888"
+    volumes:
+      - uploader-plus-acs-volume:/usr/local/tomcat/alf_data
+    depends_on:
+      - uploader-plus-postgres
+  uploader-plus-postgres:
+    image: postgres:9.6
+    environment:
+      POSTGRES_DB: alfresco
+      POSTGRES_USER: alfresco
+      POSTGRES_PASSWORD: alfresco
+    command: postgres -c max_connections=300 -c log_min_messages=LOG
+    ports:
+      - "${postgres.port}:5432"
+    volumes:
+      - uploader-plus-db-volume:/var/lib/postgresql/data
+  uploader-plus-ass:
+#    image: alfresco/alfresco-search-services:2.0.3
+    image: alfresco/alfresco-search-services:2.0.12 #this version has support for arm64, the one commented above does not despite coming as recommended.
+    environment:
+      SOLR_ALFRESCO_HOST: uploader-plus-acs
+      SOLR_ALFRESCO_PORT: 8080
+      SOLR_SOLR_HOST: uploader-plus-ass
+      SOLR_SOLR_PORT: 8983
+      SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
+    ports:
+      - "8983:8983"
+    volumes:
+      - uploader-plus-ass-volume:/opt/alfresco-search-services/contentstore
+      - uploader-plus-ass-volume:/opt/alfresco-search-services/data
+  uploader-plus-activemq:
+#      image: alfresco/alfresco-activemq:5.16.1
+      image: alfresco/alfresco-activemq:5.18-jre17-rockylinux8
+      mem_limit: 1g
+      ports:
+        - 8161:8161 # Web Console
+        - 5672:5672 # AMQP
+        - 61616:61616 # OpenWire
+        - 61613:61613 # STOMP
+
+volumes:
+  uploader-plus-acs-volume:
+    external: true
+  uploader-plus-db-volume:
+    external: true
+  uploader-plus-ass-volume:
+    external: true