Add missing flag mapping for NodesMetaDataGet

.github/dependabot.yml

@@ -38,6 +38,27 @@ updates:
   - dependency-name: org.activiti:activiti-spring
     versions:
     - ">= 7.1.a, < 7.2"
+  - dependency-name: org.apache.camel:camel-activemq
+    versions:
+    - "> 3.7.1"
+  - dependency-name: org.apache.camel:camel-amqp
+    versions:
+    - "> 3.7.1"
+  - dependency-name: org.apache.camel:camel-direct
+    versions:
+    - "> 3.7.1"
+  - dependency-name: org.apache.camel:camel-directvm
+    versions:
+    - "> 3.7.1"
+  - dependency-name: org.apache.camel:camel-jackson
+    versions:
+    - "> 3.7.1"
+  - dependency-name: org.apache.camel:camel-mock
+    versions:
+    - "> 3.7.1"
+  - dependency-name: org.apache.camel:camel-spring
+    versions:
+    - "> 3.7.1"
   - dependency-name: org.apache.chemistry.opencmis:chemistry-opencmis-client-impl
     versions:
     - "> 1.0.0"

.travis.yml

@@ -53,14 +53,14 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       script:
         - travis_retry mvn -B test -pl core,data-model
-        - travis_retry mvn -B test -pl "repository,mmt" "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite"
+        - travis_retry mvn -B test -pl repository -Dtest=AllUnitTestsSuite
 
     - name: "Repository - AppContext01TestSuite"
       if: commit_message !~ /\[skip repo\]/
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.6
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext02TestSuite"
@@ -75,7 +75,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.6
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext04TestSuite"
@@ -83,7 +83,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.6
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext05TestSuite"
@@ -102,7 +102,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.6
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext06TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContextExtraTestSuite"
@@ -110,7 +110,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.6
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - MiscContextTestSuite"
@@ -118,7 +118,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.6
       script: travis_wait 20 mvn -B test -pl repository -Dtest=MiscContextTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - SearchTestSuite"
@@ -241,7 +241,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.6
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Remote-api - AppContext03TestSuite"
@@ -249,7 +249,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.6
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Remote-api - AppContext04TestSuite"
@@ -257,7 +257,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.6
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Remote-api - AppContextExtraTestSuite"

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>14.116</version>
+      <version>14.93-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>14.116</version>
+      <version>14.93-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>14.116</version>
+      <version>14.93-SNAPSHOT</version>
    </parent>
 
    <build>
@@ -44,8 +44,8 @@
    <dependencies>
       <dependency>
          <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-reload4j</artifactId>
-         <version>1.7.35</version>
+         <artifactId>slf4j-log4j12</artifactId>
+         <version>1.7.33</version>
          <scope>test</scope>
       </dependency>
       <dependency>

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>14.116</version>
+      <version>14.93-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-community/rm-community-repo/.env

@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.5.7-A4
+TRANSFORMERS_TAG=2.5.6
 SOLR6_TAG=2.0.2
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1

amps/ags/rm-community/rm-community-repo/Dockerfile

@@ -1,17 +1,4 @@
-# BUILD STAGE AGS
-FROM debian:11-slim AS AGSBUILDER
-
-RUN export DEBIAN_FRONTEND=noninteractive; \
-    apt-get update -qqy && apt-get -yqq install unzip && \
-    mkdir -p /build/gs-api-explorer
-
-### Copy the AGS war from the local context
-COPY target/gs-api-explorer-*.war /build
-
-RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
-    chmod -R g-w,o= /build
-
-# ACTUAL IMAGE
+### Apply AGS community repo AMP to ACS image
 FROM alfresco/alfresco-community-repo-base:${image.tag}
 
 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
@@ -26,13 +13,18 @@ RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
               /usr/local/tomcat/amps \
               /usr/local/tomcat/webapps/alfresco -directory -nobackup
 
-### Copy gs-api-explorer
-COPY --chown=root:Alfresco --from=AGSBUILDER /build/gs-api-explorer /usr/local/tomcat/webapps/gs-api-explorer
+### Copy gs-api-explorer war into webapps folder
+COPY target/gs-api-explorer-*.war /usr/local/tomcat/webapps/
+
+### Unpack gs-api-explorer.war
+RUN mkdir /usr/local/tomcat/webapps/gs-api-explorer && cd /usr/local/tomcat/webapps/gs-api-explorer && \
+    jar -xvf /usr/local/tomcat/webapps/gs-api-explorer-*.war && rm -f /usr/local/tomcat/webapps/gs-api-explorer-*.war
 
 # All files in the tomcat folder must be owned by root user and Alfresco group as mentioned in the parent Dockerfile
 RUN chgrp -R Alfresco /usr/local/tomcat && \
     find /usr/local/tomcat/webapps -type d -exec chmod 0750 {} \; && \
-    find /usr/local/tomcat/webapps -type f -exec chmod 0640 {} \;
+    find /usr/local/tomcat/webapps -type f -exec chmod 0640 {} \; && \
+    chmod -R g+r /usr/local/tomcat/webapps
 
 # Switching back to alfresco user after having added amps files to run the container as non-root
 USER alfresco

amps/ags/rm-community/rm-community-repo/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>14.116</version>
+      <version>14.93-SNAPSHOT</version>
    </parent>
 
    <properties>

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/api/PublicAPITestUtil.java

@@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.api;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.reflections.scanners.Scanners.TypesAnnotated;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
@@ -78,7 +77,7 @@ public class PublicAPITestUtil
      */
     public static void testPublicAPIConsistency(String basePackageName, SetMultimap<Class<?>, Class<?>> knownBadReferences)
     {
-        Reflections reflections = new Reflections(basePackageName, TypesAnnotated);
+        Reflections reflections = new Reflections(basePackageName);
         Set<Class<?>> publicAPIClasses = reflections.getTypesAnnotatedWith(AlfrescoPublicApi.class, true);
 
         SetMultimap<Class<?>, Class<?>> referencedFrom = HashMultimap.create();

amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <properties>

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>14.116</version>
+      <version>14.93-SNAPSHOT</version>
    </parent>
 
    <dependencies>
@@ -54,9 +54,9 @@
          <classifier>asl</classifier>
       </dependency>
       <dependency>
-         <groupId>ch.qos.reload4j</groupId>
-         <artifactId>reload4j</artifactId>
-         <version>1.2.19</version>
+         <groupId>log4j</groupId>
+         <artifactId>log4j</artifactId>
+         <version>1.2.17</version>
       </dependency>
       <dependency>
          <groupId>org.json</groupId>
@@ -114,7 +114,7 @@
       <!-- Test only dependencies, as popped up while running mvn test -->
       <dependency>
          <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-reload4j</artifactId>
+         <artifactId>slf4j-log4j12</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <properties>

data-model/src/main/java/org/alfresco/repo/content/ContentRestoreParams.java

@@ -26,6 +26,7 @@
 
 package org.alfresco.repo.content;
 
+import org.alfresco.service.Experimental;
 
 /**
  * Enumeration with values for archive-restore parameter keys.
@@ -34,6 +35,7 @@ package org.alfresco.repo.content;
  *
  * @author mpichura
  */
+@Experimental
 public enum ContentRestoreParams
 {
     /**

data-model/src/main/java/org/alfresco/repo/content/ContentStore.java

@@ -26,6 +26,7 @@
 package org.alfresco.repo.content;
 
 import org.alfresco.api.AlfrescoPublicApi;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentAccessor;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -339,6 +340,7 @@ public interface ContentStore
      * @param contentUrl the URL of the content for which the storage properties are to be retrieved.
      * @return Returns a key-value (String-String) collection of storage headers/properties with their respective values.
      */
+    @Experimental
     default Map<String, String> getStorageProperties(String contentUrl)
     {
         return Collections.emptyMap();
@@ -348,12 +350,14 @@ public interface ContentStore
      * Submit a request to send content to archive (offline) state.
      * If no connector is present or connector is not supporting sending to archive, then {@link UnsupportedOperationException} will be returned.
      * Specific connector will decide which storage class/tier will be set for content.
+     * This method is experimental and subject to changes.
      *
      * @param contentUrl the URL of the content which is to be archived.
      * @param archiveParams a map of String-Serializable parameters defining Storage Provider specific request parameters (can be empty).
      * @return true when request successful, false when unsuccessful.
      * @throws UnsupportedOperationException when store is unable to handle request.
      */
+    @Experimental
     default boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
     {
         throw new UnsupportedOperationException("Request to archive content is not supported by this content store.");
@@ -366,12 +370,14 @@ public interface ContentStore
      * Keys of this map should be restricted to {@code ContentRestoreParams} enumeration.
      * For AWS S3 map can indicating expiry days, Glacier restore tier.
      * For Azure Blob map can indicate rehydrate priority.
+     * This method is experimental and subject to changes.
      *
      * @param contentUrl    the URL of the content which is to be archived.
      * @param restoreParams a map of String-Serializable parameters defining Storage Provider specific request parameters (can be empty).
      * @return true when request successful, false when unsuccessful.
      * @throws UnsupportedOperationException when store is unable to handle request.
      */
+    @Experimental
     default boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
     {
         throw new UnsupportedOperationException("Request to restore content from archive is not supported by this content store.");

data-model/src/main/java/org/alfresco/repo/content/ObjectStorageProps.java

@@ -26,6 +26,8 @@
 
 package org.alfresco.repo.content;
 
+import org.alfresco.service.Experimental;
+
 /**
  * Enumeration with "header" values for Alfresco derived Storage Properties
  * Values of this enum should be used when adding Alfresco derived key-value pairs in Storage Properties map.
@@ -33,6 +35,7 @@ package org.alfresco.repo.content;
  *
  * @author mpichura
  */
+@Experimental
 public enum ObjectStorageProps {
     /**
      * Object's content is archived and not immediately accessible.

data-model/src/main/java/org/alfresco/service/cmr/repository/ArchivedIOException.java

@@ -26,6 +26,7 @@
 package org.alfresco.service.cmr.repository;
 
 import org.alfresco.api.AlfrescoPublicApi;
+import org.alfresco.service.Experimental;
 
 /**
  * Unable to access as content is in an Archived state.
@@ -33,6 +34,7 @@ import org.alfresco.api.AlfrescoPublicApi;
  * 
  * @author David Edwards
  */
+@Experimental
 @AlfrescoPublicApi
 public class ArchivedIOException extends ContentIOException
 {

data-model/src/main/java/org/alfresco/service/cmr/repository/RestoreInProgressException.java

@@ -27,6 +27,7 @@ package org.alfresco.service.cmr.repository;
 
 import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.service.Experimental;
 
 /**
  * Content Restoration in progress
@@ -34,6 +35,7 @@ import org.alfresco.error.AlfrescoRuntimeException;
  * @author David Edwards
  */
 @AlfrescoPublicApi
+@Experimental
 public class RestoreInProgressException extends AlfrescoRuntimeException
 {
     private static final long serialVersionUID = 5483215922384016269L;

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -31,11 +31,6 @@
             <artifactId>maven-artifact</artifactId>
             <version>${dependency.maven-artifact.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

mmt/src/test/java/org/alfresco/AllMmtUnitTestSuite.java

@@ -1,43 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco;
-
-import org.junit.experimental.categories.Categories;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * All MMT Tool project UNIT test classes (no application context) should be added to this test suite.
- */
-@RunWith(Categories.class)
-@Suite.SuiteClasses({
-        org.alfresco.repo.module.tool.ModuleManagementToolTest.class,
-        org.alfresco.repo.module.tool.WarHelperImplTest.class,
-        org.alfresco.repo.module.tool.ModuleServiceImplTest.class
-})
-public class AllMmtUnitTestSuite
-{
-}

packaging/distribution/pom.xml

@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 </project>

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/environment/.env

@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.5.7-A4
+TRANSFORMERS_TAG=2.5.6
 SOLR6_TAG=2.0.2
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1

packaging/tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/tas-cmis/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSitesTests.java

@@ -347,30 +347,13 @@ public class GetSitesTests extends RestTest
     public void checkPaginationWithSkipCountAndMaxItems() throws Exception
     {
         sites = restClient.authenticateUser(regularUser).withParams("skipCount=10&maxItems=110").withCoreAPI().getSites();
-
-        int expectedCount;
-        if (sites.getPagination().isHasMoreItems())
-        {
-            expectedCount = sites.getPagination().getMaxItems();
-        }
-        else
-        {
-            if (sites.getPagination().getTotalItems() < sites.getPagination().getSkipCount())
-            {
-                expectedCount = 0;
-            }
-            else
-            {
-                expectedCount = sites.getPagination().getTotalItems() - sites.getPagination().getSkipCount();
-            }
-        }
-
         sites.getPagination().assertThat()
                 .field("totalItems").isNotEmpty().and()
                 .field("maxItems").is("110").and()
                 .field("hasMoreItems").is((sites.getPagination().getTotalItems() - sites.getPagination().getSkipCount() > sites.getPagination().getMaxItems())?"true":"false").and()
                 .field("skipCount").is("10").and()
-                .field("count").is(expectedCount);
+                .field("count").is((sites.getPagination().isHasMoreItems()) ? sites.getPagination().getMaxItems()
+                : sites.getPagination().getTotalItems() - sites.getPagination().getSkipCount());
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.SITES, TestGroup.REGRESSION})

packaging/tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <properties>

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>14.116</version>
+    <version>14.93-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -51,13 +51,13 @@
         <dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-model.version>1.4.11</dependency.alfresco-transform-model.version>
+        <dependency.alfresco-transform-model.version>1.4.7</dependency.alfresco-transform-model.version>
         <dependency.alfresco-greenmail.version>6.2</dependency.alfresco-greenmail.version>
         <dependency.acs-event-model.version>0.0.13</dependency.acs-event-model.version>
 
         <dependency.spring.version>5.3.15</dependency.spring.version>
         <dependency.antlr.version>3.5.2</dependency.antlr.version>
-        <dependency.jackson.version>2.13.1</dependency.jackson.version>
+        <dependency.jackson.version>2.13.0</dependency.jackson.version>
         <dependency.jackson-databind.version>2.13.1</dependency.jackson-databind.version>
         <dependency.cxf.version>3.5.0</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
@@ -71,9 +71,9 @@
         <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
         <dependency.httpcore.version>4.4.15</dependency.httpcore.version>
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
-        <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
-        <dependency.slf4j.version>1.7.35</dependency.slf4j.version>
-        <dependency.gytheio.version>0.16</dependency.gytheio.version>
+        <dependency.xercesImpl.version>2.12.1</dependency.xercesImpl.version>
+        <dependency.slf4j.version>1.7.33</dependency.slf4j.version>
+        <dependency.gytheio.version>0.12</dependency.gytheio.version>
         <dependency.groovy.version>3.0.9</dependency.groovy.version>
         <dependency.tika.version>2.2.1</dependency.tika.version> 
         <dependency.spring-security.version>5.6.1</dependency.spring-security.version>
@@ -82,7 +82,7 @@
         <dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version>
         <dependency.keycloak.version>15.0.2</dependency.keycloak.version>
         <dependency.jboss.logging.version>3.4.3.Final</dependency.jboss.logging.version>
-        <dependency.camel.version>3.15.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies (can cause dependency conflicts)-->
+        <dependency.camel.version>3.7.7</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies (can cause dependency conflicts)-->
         <dependency.activemq.version>5.16.1</dependency.activemq.version>
         <dependency.apache-compress.version>1.21</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
@@ -102,23 +102,23 @@
         <dependency.jakarta-jws-api.version>2.1.0</dependency.jakarta-jws-api.version>
         <dependency.jakarta-mail-api.version>1.6.5</dependency.jakarta-mail-api.version>
         <dependency.jakarta-json-api.version>1.1.6</dependency.jakarta-json-api.version>
-        <dependency.jakarta-json-path.version>2.7.0</dependency.jakarta-json-path.version>
+        <dependency.jakarta-json-path.version>2.5.0</dependency.jakarta-json-path.version>
         <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
 
         <alfresco.googledrive.version>3.2.1.3</alfresco.googledrive.version>
         <alfresco.aos-module.version>1.4.0.1</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>7.2.0-A3</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.api-explorer.version>7.2.0-M2</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
         <license-maven-plugin.version>2.0.1.alfresco-1</license-maven-plugin.version>
 
-        <dependency.postgresql.version>42.3.2</dependency.postgresql.version>
+        <dependency.postgresql.version>42.3.1</dependency.postgresql.version>
         <dependency.mysql.version>8.0.27</dependency.mysql.version>
         <dependency.mysql-image.version>8</dependency.mysql-image.version>
         <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
         <dependency.tas-utility.version>3.0.47</dependency.tas-utility.version>
         <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
-        <dependency.tas-restapi.version>1.71</dependency.tas-restapi.version>
+        <dependency.tas-restapi.version>1.68</dependency.tas-restapi.version>
         <dependency.tas-cmis.version>1.31</dependency.tas-cmis.version>
         <dependency.tas-email.version>1.8</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.6</dependency.tas-webdav.version>
@@ -146,7 +146,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>14.116</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -563,12 +563,6 @@
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-log-sanitizer</artifactId>
                 <version>${dependency.alfresco-log-sanitizer.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.alfresco.aos-module</groupId>
@@ -612,7 +606,7 @@
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-reload4j</artifactId>
+                <artifactId>slf4j-log4j12</artifactId>
                 <version>${dependency.slf4j.version}</version>
             </dependency>
             <dependency>
@@ -637,7 +631,7 @@
             <dependency>
                 <groupId>com.github.junrar</groupId>
                 <artifactId>junrar</artifactId>
-                <version>7.4.1</version>
+                <version>7.4.0</version>
             </dependency>
             <dependency>
                 <groupId>com.github.fge</groupId>
@@ -766,12 +760,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
-                <artifactId>camel-core</artifactId>
-                <version>${dependency.camel.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-spring-xml</artifactId>
+                <artifactId>camel-spring</artifactId>
                 <version>${dependency.camel.version}</version>
                 <exclusions>
                     <exclusion>
@@ -800,6 +789,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-http</artifactId>
+                <version>4.1.72.Final</version>
+            </dependency>
             <dependency>
                 <!--  If you are going to bump dependency.camel.version, please check if the netty-codec-http has higher version that the one above.-->
                 <groupId>org.apache.camel</groupId>
@@ -856,7 +850,7 @@
             <dependency>
                 <groupId>org.reflections</groupId>
                 <artifactId>reflections</artifactId>
-                <version>0.10.2</version>
+                <version>0.9.12</version>
             </dependency>
             <!-- swagger parser -->
             <dependency>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <dependencies>

remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java

@@ -167,6 +167,10 @@ public class NodesMetaDataGet extends DeclarativeWebScript
             {
                 filter.setIncludeType(o.getBoolean("includeType"));
             }
+            if(o.has("includeChildAssociations"))
+            {
+                filter.setIncludeChildAssociations(o.getBoolean("includeChildAssociations"));
+            }
             if(o.has("includeParentAssociations"))
             {
                 filter.setIncludeParentAssociations(o.getBoolean("includeParentAssociations"));

remote-api/src/main/java/org/alfresco/rest/api/ContentStorageInformation.java

@@ -30,37 +30,49 @@ import org.alfresco.rest.api.model.ArchiveContentRequest;
 import org.alfresco.rest.api.model.ContentStorageInfo;
 import org.alfresco.rest.api.model.RestoreArchivedContentRequest;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
  * Storage information for content API.
+ * Note: Currently marked as experimental and subject to change.
  *
  * @author mpichura
  */
+@Experimental
 public interface ContentStorageInformation
 {
     /**
+     * Note: Currently marked as experimental and subject to change.
+     *
      * @param nodeRef         Node reference
      * @param contentPropName Qualified name of content property (e.g. 'cm_content')
      * @param parameters      {@link Parameters} object to get the parameters passed into the request
      * @return {@link ContentStorageInfo} object consisting of qualified name of content property and a map of storage properties
      */
+    @Experimental
     ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters);
 
     /**
+     * Note: Currently marked as experimental and subject to change.
+     *
      * @param nodeRef               Node reference
      * @param contentPropName       Qualified name of content property (e.g. 'cm_content')
      * @param archiveContentRequest {@link ArchiveContentRequest} object holding parameters for archive content request
      * @return true when request successful, false when unsuccessful
      */
+    @Experimental
     boolean requestArchiveContent(NodeRef nodeRef, String contentPropName, ArchiveContentRequest archiveContentRequest);
 
     /**
+     * Note: Currently marked as experimental and subject to change.
+     *
      * @param nodeRef                       Node reference
      * @param contentPropName               Qualified name of content property (e.g. 'cm_content')
      * @param restoreArchivedContentRequest {@link RestoreArchivedContentRequest} object holding parameters for restore from archive request
      * @return true when request successful, false when unsuccessful
      */
+    @Experimental
     boolean requestRestoreContentFromArchive(NodeRef nodeRef, String contentPropName,
                                              RestoreArchivedContentRequest restoreArchivedContentRequest);
 }

remote-api/src/main/java/org/alfresco/rest/api/impl/ContentStorageInformationImpl.java

@@ -33,6 +33,7 @@ import org.alfresco.rest.api.model.ContentStorageInfo;
 import org.alfresco.rest.api.model.RestoreArchivedContentRequest;
 import org.alfresco.rest.framework.core.exceptions.RestoreInProgressException;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
@@ -44,9 +45,11 @@ import java.util.Map;
 
 /**
  * Default implementation for {@link ContentStorageInformation}
+ * Note: Currently marked as experimental and subject to change.
  *
  * @author mpichura
  */
+@Experimental
 public class ContentStorageInformationImpl implements ContentStorageInformation
 {
 
@@ -65,6 +68,7 @@ public class ContentStorageInformationImpl implements ContentStorageInformation
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters)
     {
         final QName propQName = getQName(contentPropName);

remote-api/src/main/java/org/alfresco/rest/api/impl/DownloadsImpl.java

@@ -38,6 +38,7 @@ import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.model.Download;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.download.DownloadService;
 import org.alfresco.service.cmr.download.DownloadStatus;
 import org.alfresco.service.cmr.module.ModuleService;
@@ -213,7 +214,8 @@ public class DownloadsImpl implements Downloads
      * @param checkLimit The maximum number of nodes to check, set to -1 for no limit
      * @see #checkArchiveStatus(NodeRef[], int, Set)
      */
-    protected void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit)
+    @Experimental
+    protected void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit) 
     {
         if (canCheckArchived()) 
         {
@@ -232,6 +234,7 @@ public class DownloadsImpl implements Downloads
      * @param checkLimit The maximum number of nodes to check, set to -1 for no limit
      * @param cache Tracks nodes that we have already checked, if null an empty cache will be created
      */
+    @Experimental
     private void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit, Set<NodeRef> cache)
     {
         // Create the cache for recursive calls.
@@ -288,7 +291,8 @@ public class DownloadsImpl implements Downloads
         }
     }
 
-    protected boolean canCheckArchived()
+    @Experimental
+    protected boolean canCheckArchived() 
     {
         return Arrays.stream(CLOUD_CONNECTOR_MODULES).anyMatch(m-> moduleService.getModule(m) != null);
     }

remote-api/src/main/java/org/alfresco/rest/api/model/ArchiveContentRequest.java

@@ -26,15 +26,19 @@
 
 package org.alfresco.rest.api.model;
 
+import org.alfresco.service.Experimental;
+
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Request for content archive.
+ * Marked as experimental and subject to change.
  *
  * @author mpichura
  */
+@Experimental
 public class ArchiveContentRequest
 {
     /**

remote-api/src/main/java/org/alfresco/rest/api/model/RestoreArchivedContentRequest.java

@@ -26,11 +26,15 @@
 
 package org.alfresco.rest.api.model;
 
+import org.alfresco.service.Experimental;
+
 /**
  * Request for restore content from archive.
+ * Marked as experimental and subject to change.
  *
  * @author mpichura
  */
+@Experimental
 public class RestoreArchivedContentRequest
 {
     /**

remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelation.java

@@ -39,6 +39,7 @@ import org.alfresco.rest.framework.resource.RelationshipResource;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.util.PropertyCheck;
@@ -48,9 +49,11 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
  * Node storage information.
+ * Note: Currently marked as experimental and subject to change.
  *
  * @author mpichura
  */
+@Experimental
 @RelationshipResource(name = "storage-info", entityResource = NodesEntityResource.class, title = "Node's content storage information")
 public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadById<ContentStorageInfo>, InitializingBean
 {
@@ -79,6 +82,7 @@ public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadB
         return storageInformation.getStorageInfo(nodeRef, contentPropName, parameters);
     }
 
+    @Experimental
     @Operation("archive")
     @WebApiParam(name = "archiveContentRequest", title = "Request for archive content",
             description = "Optional parameters for archive content", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
@@ -99,6 +103,7 @@ public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadB
         }
     }
 
+    @Experimental
     @Operation("archive-restore")
     @WebApiParam(name = "restoreArchivedContentRequest", title = "Request for restore content from archive",
             description = "Optional parameters for restore content from archive", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)

remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java

@@ -26,28 +26,18 @@
 
 package org.alfresco.rest.api.nodes;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
-import org.alfresco.repo.content.directurl.DirectAccessUrlDisabledException;
-import org.alfresco.rest.api.DirectAccessUrlHelper;
 import org.alfresco.rest.api.Renditions;
-import org.alfresco.rest.api.model.DirectAccessUrlRequest;
 import org.alfresco.rest.api.model.Rendition;
 import org.alfresco.rest.framework.BinaryProperties;
-import org.alfresco.rest.framework.Operation;
 import org.alfresco.rest.framework.WebApiDescription;
-import org.alfresco.rest.framework.WebApiParam;
-import org.alfresco.rest.framework.core.ResourceParameter;
-import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
 import org.alfresco.rest.framework.resource.RelationshipResource;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
 import org.alfresco.rest.framework.resource.content.BinaryResource;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
-import org.alfresco.rest.framework.webscripts.WithResponse;
-import org.alfresco.service.cmr.repository.DirectAccessUrl;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.util.PropertyCheck;
@@ -63,7 +53,6 @@ import org.springframework.extensions.webscripts.Status;
  * - GET    /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}
  * - DELETE /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}
  * - GET    /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/content
- * - POST   /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/request-direct-access-url
  *
  * @author janv
  */
@@ -76,18 +65,12 @@ public class NodeVersionRenditionsRelation implements RelationshipResourceAction
         InitializingBean
 {
     private Renditions renditions;
-    private DirectAccessUrlHelper directAccessUrlHelper;
 
     public void setRenditions(Renditions renditions)
     {
         this.renditions = renditions;
     }
 
-    public void setDirectAccessUrlHelper(DirectAccessUrlHelper directAccessUrlHelper)
-    {
-        this.directAccessUrlHelper = directAccessUrlHelper;
-    }
-
     @Override
     public void afterPropertiesSet() throws Exception
     {
@@ -134,36 +117,6 @@ public class NodeVersionRenditionsRelation implements RelationshipResourceAction
         return renditions.getContent(nodeRef, versionId, renditionId, parameters);
     }
 
-    @Operation ("request-direct-access-url")
-    @WebApiParam (name = "directAccessUrlRequest",
-                  title = "Request direct access url",
-                  description = "Options for direct access url request",
-                  kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
-    @WebApiDescription(title = "Request content url",
-                       description="Generates a direct access URL.",
-                       successStatus = HttpServletResponse.SC_OK)
-    public DirectAccessUrl requestContentDirectUrl(String nodeId,
-                                                   String versionId,
-                                                   DirectAccessUrlRequest directAccessUrlRequest,
-                                                   Parameters parameters, WithResponse withResponse)
-    {
-        boolean attachment = directAccessUrlHelper.getAttachment(directAccessUrlRequest);
-        Long validFor = directAccessUrlHelper.getDefaultExpiryTimeInSec();
-        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
-        String renditionId = parameters.getRelationship2Id();
-
-        DirectAccessUrl directAccessUrl;
-        try
-        {
-            directAccessUrl = renditions.requestContentDirectUrl(nodeRef, versionId, renditionId, attachment, validFor);
-        }
-        catch (DirectAccessUrlDisabledException ex)
-        {
-            throw new DisabledServiceException(ex.getMessage());
-        }
-        return directAccessUrl;
-    }
-
     @WebApiDescription(title = "Delete rendition")
     @Override
     public void delete(String nodeId, String versionId, Parameters parameters)

remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsStorageInfoRelation.java

@@ -40,6 +40,7 @@ import org.alfresco.rest.framework.resource.RelationshipResource;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.util.PropertyCheck;
@@ -51,9 +52,12 @@ import javax.servlet.http.HttpServletResponse;
  * Node Versions storage information.
  *
  *  - GET  /nodes/{nodeId}/versions/{versionId}/storage-info/{contentPropQNameId}
+ * 
+ * Note: Currently marked as experimental and subject to change.
  *
  * @author janv
  */
+@Experimental
 @RelationshipResource(name = "storage-info", entityResource = NodeVersionsRelation.class, title = "Node Version's content storage information")
 public class NodeVersionsStorageInfoRelation implements RelationshipResourceAction.ReadById<ContentStorageInfo>, InitializingBean
 {
@@ -87,6 +91,7 @@ public class NodeVersionsStorageInfoRelation implements RelationshipResourceActi
         return storageInformation.getStorageInfo(versionNodeRef, contentPropQNameId, parameters);
     }
 
+    @Experimental
     @Operation("archive")
     @WebApiParam(name = "archiveContentRequest", title = "Request for archive version content",
             description = "Optional parameters for archive version content", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
@@ -111,6 +116,7 @@ public class NodeVersionsStorageInfoRelation implements RelationshipResourceActi
         }
     }
 
+    @Experimental
     @Operation("archive-restore")
     @WebApiParam(name = "restoreArchivedContentRequest", title = "Request for restore version content from archive",
             description = "Optional parameters for restore version content from archive", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)

remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ArchivedContentException.java

@@ -25,12 +25,15 @@
  */
 package org.alfresco.rest.framework.core.exceptions;
 
+import org.alfresco.service.Experimental;
+
 /**
  * Thrown when the content is archived and not readily accessible.
  * Status is <i>Precondition Failed</i> client error = 412.
  *
  * @author David Edwards
  */
+@Experimental
 public class ArchivedContentException  extends  ApiException
 {
 

remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RestoreInProgressException.java

@@ -25,6 +25,9 @@
  */
 package org.alfresco.rest.framework.core.exceptions;
 
+import org.alfresco.service.Experimental;
+
+@Experimental
 public class RestoreInProgressException extends  ApiException
 {
     public static String DEFAULT_MESSAGE_ID = "framework.exception.RestoreInProgress";

remote-api/src/main/resources/alfresco/public-rest-context.xml

@@ -1452,7 +1452,6 @@
 
     <bean class="org.alfresco.rest.api.nodes.NodeVersionRenditionsRelation">
         <property name="renditions" ref="Renditions" />
-        <property name="directAccessUrlHelper" ref="directAccessUrlHelper" />
     </bean>
 
     <bean class="org.alfresco.rest.api.quicksharelinks.QuickShareLinkRenditionsRelation">

remote-api/src/test/java/org/alfresco/AppContext02TestSuite.java

@@ -53,7 +53,6 @@ import org.junit.runners.Suite;
     org.alfresco.rest.api.tests.NodeApiTest.class,
     org.alfresco.rest.api.tests.NodeAssociationsApiTest.class,
     org.alfresco.rest.api.tests.NodeVersionsApiTest.class,
-    org.alfresco.rest.api.tests.NodeVersionRenditionsApiTest.class,
     org.alfresco.rest.api.tests.QueriesNodesApiTest.class,
     org.alfresco.rest.api.tests.QueriesPeopleApiTest.class,
     org.alfresco.rest.api.tests.QueriesSitesApiTest.class,

remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java

@@ -25,8 +25,6 @@
  */
 package org.alfresco.rest.api.tests;
 
-import org.alfresco.repo.content.directurl.SystemWideDirectUrlConfig;
-import org.alfresco.rest.api.impl.directurl.RestApiDirectUrlConfig;
 import org.alfresco.rest.api.tests.client.PublicApiHttpClient;
 import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsString;
 import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
@@ -221,11 +219,6 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
         return URL_NODES + "/" + nodeId + "/" + REQUEST_DIRECT_ACCESS_URL;
     }
 
-    protected String getRequestVersionRenditionContentDirectUrl(String nodeId, String versionId, String renditionId)
-    {
-        return getNodeVersionRenditionIdUrl(nodeId, versionId, renditionId) + "/" + REQUEST_DIRECT_ACCESS_URL;
-    }
-
     protected String getRequestArchivedContentDirectUrl(String nodeId)
     {
         return URL_DELETED_NODES + "/" + nodeId + "/" + REQUEST_DIRECT_ACCESS_URL;
@@ -236,17 +229,6 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
         return URL_DELETED_NODES + "/" + nodeId + "/" + URL_RENDITIONS + "/" + renditionID + "/" + REQUEST_DIRECT_ACCESS_URL;
     }
 
-    protected String getRequestRenditionDirectAccessUrl(String nodeId, String renditionID)
-    {
-        return URL_NODES + "/" + nodeId + "/" + URL_RENDITIONS + "/" + renditionID + "/" + REQUEST_DIRECT_ACCESS_URL;
-    }
-
-    protected String getRequestVersionDirectAccessUrl(String nodeId, String versionId)
-    {
-        return URL_NODES + "/" + nodeId + "/" + URL_VERSIONS + "/" + versionId + "/" + REQUEST_DIRECT_ACCESS_URL;
-    }
-
-
     /**
      * The api scope. either public or private
      *
@@ -742,18 +724,6 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
         return createNode(parentId, folderName, TYPE_CM_FOLDER, props, Folder.class);
     }
 
-    protected String createUniqueFolder(String parentId) throws Exception
-    {
-        return createFolder(parentId, "folder-" + System.currentTimeMillis()).getId();
-    }
-
-    protected String createUniqueContent(String folderId) throws Exception
-    {
-        Document documentResp = createTextFile(folderId, "file-" + System.currentTimeMillis(),
-        "some text-" + System.currentTimeMillis(), "UTF-8", null);
-        return documentResp.getId();
-    }
-
     protected Node createNode(String parentId, String nodeName, String nodeType, Map<String, Object> props) throws Exception
     {
         return createNode(parentId, nodeName, nodeType, props, Node.class);
@@ -1105,20 +1075,5 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
         return URL_NODES + "/" + nodeId;
     }
 
-    protected void enableRestDirectAccessUrls()
-    {
-        SystemWideDirectUrlConfig systemDauConfig = (SystemWideDirectUrlConfig) applicationContext.getBean("systemWideDirectUrlConfig");
-        systemDauConfig.setEnabled(true);
-        RestApiDirectUrlConfig restDauConfig = (RestApiDirectUrlConfig) applicationContext.getBean("restApiDirectUrlConfig");
-        restDauConfig.setEnabled(true);
-    }
-
-    protected void disableRestDirectAccessUrls()
-    {
-        SystemWideDirectUrlConfig systemDauConfig = (SystemWideDirectUrlConfig) applicationContext.getBean("systemWideDirectUrlConfig");
-        systemDauConfig.setEnabled(false);
-        RestApiDirectUrlConfig restDauConfig = (RestApiDirectUrlConfig) applicationContext.getBean("restApiDirectUrlConfig");
-        restDauConfig.setEnabled(false);
-    }
 }
 

remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java

@@ -6279,70 +6279,92 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
     }
 
     @Test
-    public void testRequestContentDirectUrlClientErrorResponseForNodes() throws Exception
+    public void testRequestVersionsContentDirectUrl() throws Exception
     {
-        enableRestDirectAccessUrls();
-
-        //Node does not exist
         setRequestContext(user1);
 
-        HttpResponse nodeDoesNotExistResponse = post(getRequestContentDirectUrl("non-existing-node-id"), null, 404);
+        String myNodeId = getMyNodeId();
 
-        //Node is not a file
-        String folderId = createFolder(tDocLibNodeId, "some-folder-name").getId();
-        HttpResponse nodeIsNotAFileReponse = post(getRequestContentDirectUrl(folderId), null, 400);
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType(TYPE_CM_CONTENT);
 
-        disableRestDirectAccessUrls();
+        // create *empty* text file - as of now, versioning is not enabled by default
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        String docId = documentResp.getId();
+        assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
+
+        int majorVersion = 1;
+        int minorVersion = 0;
+
+        String content = "The quick brown fox jumps over the lazy dog ";
+
+        Map<String, String> params = new HashMap<>();
+        params.put("comment", "my version ");
+
+        documentResp = updateTextFile(docId, content, params);
+        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNotNull(documentResp.getProperties());
+        assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
+
+        final String contentNodeId = documentResp.getId();
+
+        // Check the upload response
+        assertNotNull(documentResp.getProperties());
+        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+        ContentInfo contentInfo = documentResp.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+
+        HttpResponse dauResponse = post(getRequestContentDirectUrl(contentNodeId), null, null, null, null, 501);
     }
 
     @Test
-    public void testRequestContentDirectUrlClientErrorResponseForVersions() throws Exception
+    public void testRequestRenditionContentDirectUrl() throws Exception
     {
-        enableRestDirectAccessUrls();
-        // Create a document
         setRequestContext(user1);
 
-        String folderNodeId = createUniqueFolder(getMyNodeId());
-        String contentNodeId = createUniqueContent(folderNodeId);
+        RepoService.TestNetwork networkN1;
+        RepoService.TestPerson userOneN1;
+        Site userOneN1Site;
 
-        // Verify versions
-        HttpResponse versionIdDoesNotExistReponse = post(getRequestVersionDirectAccessUrl(contentNodeId, "1.2"), null, null, null, null, 404);
-        HttpResponse versionIdInvalidReponse = post(getRequestVersionDirectAccessUrl(contentNodeId, "invalid-version"), null, null, null, null, 404);
+        networkN1 = repoService.createNetworkWithAlias("ping", true);
+        networkN1.create();
+        userOneN1 = networkN1.createUser();
 
-        disableRestDirectAccessUrls();
-    }
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
 
-    @Test
-    public void testRequestContentDirectUrlClientErrorResponseForRenditions() throws Exception
-    {
-        enableRestDirectAccessUrls();
-        // Create a document
-        setRequestContext(user1);
+        String siteTitle = "RandomSite" + System.currentTimeMillis();
+        userOneN1Site = createSite(siteTitle, SiteVisibility.PRIVATE);
 
-        String folderNodeId = createUniqueFolder(getMyNodeId());
-        String contentNodeId = createUniqueContent(folderNodeId);
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String parentId = getSiteContainerNodeId(userOneN1Site.getId(), "documentLibrary");
+        String folder_Id = createNode(parentId, folderName, TYPE_CM_FOLDER, null).getId();
 
-        // Verify renditions
-        HttpResponse renditionIdDoesNotExistReponse = post(getRequestRenditionDirectAccessUrl(contentNodeId, "pdf"), null, null, null, null, 404);
-        HttpResponse renditionIdInvalidReponse = post(getRequestRenditionDirectAccessUrl(contentNodeId, "invalid-rendition"), null, null, null, null, 404);
+        // Create multipart request - pdf file
+        String renditionName = "doclib";
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartRequest reqBody = MultiPartBuilder.create()
+            .setFileData(new FileData(fileName, file))
+            .setRenditions(Collections.singletonList(renditionName))
+            .build();
 
-        disableRestDirectAccessUrls();
-    }
+        // Upload quick.pdf file into 'folder' - including request to create 'doclib' thumbnail
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
 
-    @Test
-    public void testRequestContentDirectUrlClientErrorResponseForDeletion() throws Exception
-    {
-        enableRestDirectAccessUrls();
-        // Create a document
-        setRequestContext(user1);
+        // wait and check that rendition is created ...
+        Rendition rendition = waitAndGetRendition(contentNodeId, null, renditionName);
+        assertNotNull(rendition);
+        assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
 
-        String folderNodeId = createUniqueFolder(getMyNodeId());
-        String contentNodeId = createUniqueContent(folderNodeId);
-
-        // Verify deletion
-        HttpResponse nodeNotDeletedReponse = post(getRequestArchivedContentDirectUrl(contentNodeId), null, null, null, null, 404);
-
-        disableRestDirectAccessUrls();
+        HttpResponse dauResponse = post(getRequestContentDirectUrl(contentNodeId), null, null, null, null, 501);
     }
 
     @Test

remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionRenditionsApiTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -27,32 +27,20 @@ package org.alfresco.rest.api.tests;
 
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.web.scripts.RepositoryContainer;
 import org.alfresco.rest.AbstractSingleNetworkSiteTest;
-import org.alfresco.rest.api.DirectAccessUrlHelper;
-import org.alfresco.rest.api.impl.directurl.RestApiDirectUrlConfig;
-import org.alfresco.rest.api.model.Site;
-import org.alfresco.rest.api.nodes.NodesEntityResource;
 import org.alfresco.rest.api.tests.client.HttpResponse;
 import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
 import org.alfresco.rest.api.tests.client.data.ContentInfo;
 import org.alfresco.rest.api.tests.client.data.Document;
 import org.alfresco.rest.api.tests.client.data.Node;
 import org.alfresco.rest.api.tests.client.data.Rendition;
-import org.alfresco.rest.api.tests.util.MultiPartBuilder;
-import org.alfresco.rest.api.tests.util.MultiPartBuilder.FileData;
-import org.alfresco.rest.api.tests.util.MultiPartBuilder.MultiPartRequest;
 import org.alfresco.rest.api.tests.util.RestApiUtil;
 import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsString;
 
 import static org.junit.Assert.*;
 
-import org.alfresco.service.cmr.site.SiteVisibility;
-import org.junit.After;
 import org.junit.Test;
-import org.mockito.Mockito;
 
-import java.io.File;
 import java.util.*;
 
 /**
@@ -285,138 +273,6 @@ public class NodeVersionRenditionsApiTest extends AbstractSingleNetworkSiteTest
         }
     }
 
-    @Test
-    public void testRequestVersionRenditionContentDirectUrl() throws Exception
-    {
-        setRequestContext(user1);
-
-        RepoService.TestNetwork networkN1;
-        RepoService.TestPerson userOneN1;
-        Site userOneN1Site;
-
-        networkN1 = repoService.createNetworkWithAlias("ping", true);
-        networkN1.create();
-        userOneN1 = networkN1.createUser();
-
-        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
-
-        String siteTitle = "RandomSite" + System.currentTimeMillis();
-        userOneN1Site = createSite(siteTitle, SiteVisibility.PRIVATE);
-
-        String PROP_LTM = "cm:lastThumbnailModification";
-
-        String RENDITION_NAME = "imgpreview";
-
-        String userId = userOneN1.getId();
-        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
-
-        // Create a folder within the site document's library
-        String folderName = "folder" + System.currentTimeMillis();
-        String parentId = getSiteContainerNodeId(userOneN1Site.getId(), "documentLibrary");
-        String folder_Id = createNode(parentId, folderName, TYPE_CM_FOLDER, null).getId();
-
-        // Create multipart request - pdf file
-        String fileName = "quick.pdf";
-        File file = getResourceFile(fileName);
-        MultiPartRequest reqBody = MultiPartBuilder.create()
-                                                   .setFileData(new FileData(fileName, file))
-                                                   .build();
-        Map<String, String> params = Collections.singletonMap("include", "properties");
-
-        // Upload quick.pdf file into 'folder' - do not include request to create 'doclib' thumbnail
-        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), params, null, "alfresco", reqBody.getContentType(), 201);
-        Document document1 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
-        String contentNodeId = document1.getId();
-        assertNotNull(document1.getProperties());
-
-        // pause briefly
-        Thread.sleep(DELAY_IN_MS);
-
-        // Get rendition (not created yet) information for node
-        response = getSingle(getNodeRenditionsUrl(contentNodeId), RENDITION_NAME, 200);
-        Rendition rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
-        assertNotNull(rendition);
-        assertEquals(Rendition.RenditionStatus.NOT_CREATED, rendition.getStatus());
-
-        params = new HashMap<>();
-        params.put("placeholder", "false");
-        getSingle(getNodeRenditionsUrl(contentNodeId), (RENDITION_NAME + "/content"), params, 404);
-
-        // Create and get 'imgpreview' rendition
-        rendition = createAndGetRendition(contentNodeId, RENDITION_NAME);
-        assertNotNull(rendition);
-
-        params = new HashMap<>();
-        params.put("placeholder", "false");
-        response = getSingle(getNodeRenditionsUrl(contentNodeId), (RENDITION_NAME + "/content"), params, 200);
-
-        byte[] renditionBytes1 = response.getResponseAsBytes();
-        assertNotNull(renditionBytes1);
-
-        // check node details ...
-        params = Collections.singletonMap("include", "properties");
-        response = getSingle(NodesEntityResource.class, contentNodeId, params, 200);
-        Document document1b = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
-        assertEquals(document1b.getModifiedByUser().getId(), document1.getModifiedByUser().getId());
-
-        // upload another version of "quick.pdf" and check again
-        fileName = "quick-2.pdf";
-        file = getResourceFile(fileName);
-        reqBody = MultiPartBuilder.create()
-                                  .setFileData(new FileData("quick.pdf", file))
-                                  .setOverwrite(true)
-                                  .build();
-
-        response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, null, "alfresco", reqBody.getContentType(), 201);
-        Document document2 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
-        assertEquals(contentNodeId, document2.getId());
-
-        // wait to allow new version of the rendition to be created ...
-        Thread.sleep(DELAY_IN_MS * 4);
-
-        params = new HashMap<>();
-        params.put("placeholder", "false");
-        response = getSingle(getNodeRenditionsUrl(contentNodeId), (RENDITION_NAME + "/content"), params, 200);
-        assertNotNull(response.getResponseAsBytes());
-
-        // check rendition binary has changed
-        assertNotEquals(renditionBytes1, response.getResponseAsBytes());
-
-        params = Collections.singletonMap("include", "properties");
-        response = getSingle(NodesEntityResource.class, contentNodeId, params, 200);
-        Document document2b = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
-
-        String contentNodeId2b = document2b.getId();
-        HttpResponse dauResponse = post(getRequestVersionRenditionContentDirectUrl(contentNodeId2b, "1.0", RENDITION_NAME), null, null, null, null, 501);
-    }
-
-    @Test
-    public void testRequestVersionRenditionContentDirectUrlErrorResponses () throws Exception
-    {
-        setRequestContext(user1);
-
-        String folderNodeId = createUniqueFolder(getMyNodeId());
-        String contentNodeId = createUniqueContent(folderNodeId);
-        createVersionRendition(contentNodeId, "1.0", "doclib");
-
-        // REST direct access URLs must be enabled in order to test DAU error responses
-        enableRestDirectAccessUrls();
-
-        // Test error response for node does not exist
-        HttpResponse dauResponseForNoSuchNode = post(getRequestVersionRenditionContentDirectUrl("nosuchnode", "1.0", "doclib"), null, 404);
-
-        // Test error response for node is not a file
-        HttpResponse dauResponseForNodeIsNotAFile = post(getRequestVersionRenditionContentDirectUrl(folderNodeId, "1.0", "doclib"), null, 400);
-
-        // Test error response for version does not exist
-        HttpResponse dauResponseForNoSuchVersion = post(getRequestVersionRenditionContentDirectUrl(contentNodeId, "2.0", "doclib"), null, 404);
-
-        // Test error response for rendition does not exist
-        HttpResponse dauResponseForNoSuchRendition = post(getRequestVersionRenditionContentDirectUrl(contentNodeId, "1.0", "avatar"), null, 404);
-
-        disableRestDirectAccessUrls();
-    }
-
     private void checkCreateAndGetVersionRendition(String docId, String versionId, String renditionId) throws Exception
     {
         String getRenditionsUrl;
@@ -505,12 +361,6 @@ public class NodeVersionRenditionsApiTest extends AbstractSingleNetworkSiteTest
         assertTrue(contentInfo.getSizeInBytes() > 0);
     }
 
-    private void createVersionRendition(String contentNodeId, String versionId, String renditionId) throws Exception
-    {
-        getAll(getNodeVersionRenditionsUrl(contentNodeId, versionId), null, 200);
-        checkCreateAndGetVersionRendition(contentNodeId, versionId, renditionId);
-    }
-
     @Override
     public String getScope()
     {

remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionsApiTest.java

@@ -25,7 +25,6 @@
  */
 package org.alfresco.rest.api.tests;
 
-import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.rest.AbstractSingleNetworkSiteTest;
 import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.model.VersionOptions;
@@ -34,7 +33,6 @@ import org.alfresco.rest.api.tests.client.HttpResponse;
 import org.alfresco.rest.api.tests.client.PublicApiClient;
 import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
 import org.alfresco.rest.api.tests.client.PublicApiHttpClient;
-import org.alfresco.rest.api.tests.client.data.ContentInfo;
 import org.alfresco.rest.api.tests.client.data.Document;
 import org.alfresco.rest.api.tests.client.data.Node;
 import org.alfresco.rest.api.tests.util.RestApiUtil;
@@ -1085,50 +1083,6 @@ public class NodeVersionsApiTest extends AbstractSingleNetworkSiteTest
         }
     }
 
-    @Test
-    public void testRequestVersionsContentDirectUrl() throws Exception
-    {
-        setRequestContext(user1);
-
-        String myNodeId = getMyNodeId();
-
-        Document d1 = new Document();
-        d1.setName("d1.txt");
-        d1.setNodeType(TYPE_CM_CONTENT);
-
-        // create *empty* text file - as of now, versioning is not enabled by default
-        HttpResponse response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(d1), 201);
-        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
-
-        String docId = documentResp.getId();
-        assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
-        assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
-
-        int majorVersion = 1;
-        int minorVersion = 0;
-
-        String content = "The quick brown fox jumps over the lazy dog ";
-
-        Map<String, String> params = new HashMap<>();
-        params.put("comment", "my version ");
-
-        documentResp = updateTextFile(docId, content, params);
-        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
-        assertNotNull(documentResp.getProperties());
-        assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
-
-        final String contentNodeId = documentResp.getId();
-
-        // Check the upload response
-        assertNotNull(documentResp.getProperties());
-        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
-        ContentInfo contentInfo = documentResp.getContent();
-        assertNotNull(contentInfo);
-        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
-
-        HttpResponse dauResponse = post(getRequestVersionDirectAccessUrl(contentNodeId, majorVersion+"."+minorVersion), null, null, null, null, 501);
-    }
-
     /**
      * Test version creation when updating file binary content.
      *

remote-api/src/test/java/org/alfresco/rest/api/tests/RenditionsTest.java

@@ -515,51 +515,6 @@ public class RenditionsTest extends AbstractBaseApiTest
         }
     }
 
-    @Test
-    public void testRequestRenditionContentDirectUrl() throws Exception
-    {
-        setRequestContext(user1);
-
-        RepoService.TestNetwork networkN1;
-        RepoService.TestPerson userOneN1;
-        Site userOneN1Site;
-
-        networkN1 = repoService.createNetworkWithAlias("ping", true);
-        networkN1.create();
-        userOneN1 = networkN1.createUser();
-
-        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
-
-        String siteTitle = "RandomSite" + System.currentTimeMillis();
-        userOneN1Site = createSite(siteTitle, SiteVisibility.PRIVATE);
-
-        // Create a folder within the site document's library
-        String folderName = "folder" + System.currentTimeMillis();
-        String parentId = getSiteContainerNodeId(userOneN1Site.getId(), "documentLibrary");
-        String folder_Id = createNode(parentId, folderName, TYPE_CM_FOLDER, null).getId();
-
-        // Create multipart request - pdf file
-        String renditionName = "doclib";
-        String fileName = "quick.pdf";
-        File file = getResourceFile(fileName);
-        MultiPartRequest reqBody = MultiPartBuilder.create()
-                .setFileData(new FileData(fileName, file))
-                .setRenditions(Collections.singletonList(renditionName))
-                .build();
-
-        // Upload quick.pdf file into 'folder' - including request to create 'doclib' thumbnail
-        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
-        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
-        String contentNodeId = document.getId();
-
-        // wait and check that rendition is created ...
-        Rendition rendition = waitAndGetRendition(contentNodeId, null, renditionName);
-        assertNotNull(rendition);
-        assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
-
-        HttpResponse dauResponse = post(getRequestRenditionDirectAccessUrl(contentNodeId, renditionName), null, null, null, null, 501);
-    }
-
     /**
      * Tests create rendition when on upload/create of a file
      *

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.116</version>
+        <version>14.93-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -46,10 +46,6 @@
                     <groupId>com.sun.mail</groupId>
                     <artifactId>javax.mail</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
@@ -202,6 +198,24 @@
             <artifactId>maven-artifact</artifactId>
             <version>${dependency.maven-artifact.version}</version>
         </dependency>
+        <dependency>
+            <groupId>de.schlichtherle.truezip</groupId>
+            <artifactId>truezip-driver-zip</artifactId>
+            <version>${dependency.truezip.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.schlichtherle.truezip</groupId>
+            <artifactId>truezip-file</artifactId>
+            <version>${dependency.truezip.version}</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>com.sun.pdfview</groupId>
             <artifactId>pdfrenderer</artifactId>
@@ -223,7 +237,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-reload4j</artifactId>
+            <artifactId>slf4j-log4j12</artifactId>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
@@ -418,7 +432,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis-spring</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.6</version>
         </dependency>
 
         <!-- Activiti -->
@@ -656,11 +670,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring-xml</artifactId>
+            <artifactId>camel-spring</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>

repository/src/main/java/org/alfresco/repo/content/AbstractRoutingContentStore.java

@@ -35,6 +35,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
@@ -424,6 +425,7 @@ public abstract class AbstractRoutingContentStore implements ContentStore
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public Map<String, String> getStorageProperties(String contentUrl)
     {
         ContentStore contentStore = selectReadStore(contentUrl);
@@ -443,6 +445,7 @@ public abstract class AbstractRoutingContentStore implements ContentStore
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
     {
         final ContentStore contentStore = selectReadStore(contentUrl);
@@ -460,6 +463,7 @@ public abstract class AbstractRoutingContentStore implements ContentStore
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
     {
         final ContentStore contentStore = selectReadStore(contentUrl);

repository/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java

@@ -46,6 +46,7 @@ import org.alfresco.repo.policy.ClassPolicyDelegate;
 import org.alfresco.repo.policy.JavaBehaviour;
 import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.InvalidTypeException;
@@ -667,6 +668,7 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName)
     {
         final ContentData contentData = getContentDataOrThrowError(nodeRef, propertyQName);

repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java

@@ -37,6 +37,7 @@ import org.alfresco.repo.content.caching.quota.QuotaManagerStrategy;
 import org.alfresco.repo.content.caching.quota.UnlimitedQuotaStrategy;
 import org.alfresco.repo.content.filestore.FileContentStore;
 import org.alfresco.repo.content.filestore.SpoofedTextContentReader;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentStreamListener;
@@ -386,6 +387,7 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public Map<String, String> getStorageProperties(final String contentUrl)
     {
         return backingStore.getStorageProperties(contentUrl);
@@ -395,6 +397,7 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
     {
         return backingStore.requestSendContentToArchive(contentUrl, archiveParams);
@@ -404,6 +407,7 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
     {
         return backingStore.requestRestoreContentFromArchive(contentUrl, restoreParams);

repository/src/main/java/org/alfresco/repo/content/replication/AggregatingContentStore.java

@@ -40,6 +40,7 @@ import org.alfresco.repo.content.ContentContext;
 import org.alfresco.repo.content.ContentStore;
 import org.alfresco.repo.content.UnsupportedContentUrlException;
 import org.alfresco.repo.content.caching.CachingContentStore;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
@@ -402,6 +403,7 @@ public class AggregatingContentStore extends AbstractContentStore
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public Map<String, String> getStorageProperties(String contentUrl)
     {
         checkPrimaryStore();
@@ -455,6 +457,7 @@ public class AggregatingContentStore extends AbstractContentStore
     /**
      * {@inheritDoc}
      */
+    @Experimental
     @Override
     public boolean requestSendContentToArchive(final String contentUrl, Map<String, Serializable> archiveParams)
     {
@@ -464,6 +467,7 @@ public class AggregatingContentStore extends AbstractContentStore
     /**
      * {@inheritDoc}
      */
+    @Experimental
     @Override
     public boolean requestRestoreContentFromArchive(final String contentUrl, final Map<String, Serializable> restoreParams)
     {

repository/src/main/java/org/alfresco/repo/content/transform/AbstractLocalTransform.java

@@ -86,7 +86,6 @@ public abstract class AbstractLocalTransform implements LocalTransform
                                           String renditionName, NodeRef sourceNodeRef)
             throws UnsupportedTransformationException, ContentIOException;
 
-    @Override
     public String getName()
     {
         return name;

repository/src/main/java/org/alfresco/repo/content/transform/DummyTransformServiceRegistry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2022 Alfresco Software Limited
+ * Copyright (C) 2019 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -25,7 +25,6 @@
  */
 package org.alfresco.repo.content.transform;
 
-import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.transform.client.registry.TransformServiceRegistry;
 
 import java.util.Map;
@@ -50,10 +49,4 @@ public class DummyTransformServiceRegistry implements TransformServiceRegistry
     {
         return null;
     }
-
-    @Override
-    public boolean isSupported(CoreFunction function, String transformerName)
-    {
-        return true;
-    }
 }

repository/src/main/java/org/alfresco/repo/content/transform/LocalTransform.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2022 Alfresco Software Limited
+ * Copyright (C) 2019 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -54,9 +54,4 @@ public interface LocalTransform
     void transform(ContentReader reader, ContentWriter writer, Map<String, String> transformOptions,
                    String renditionName, NodeRef sourceNodeRef)
             throws UnsupportedTransformationException, ContentIOException;
-
-    /**
-     * @return the name of the transform.
-     */
-    String getName();
 }

repository/src/main/java/org/alfresco/repo/content/transform/LocalTransformServiceRegistry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2019 - 2022 Alfresco Software Limited
+ * Copyright (C) 2019 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -36,7 +36,6 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import org.alfresco.service.cmr.repository.MimetypeService;
-import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.transform.client.model.config.TransformOptionGroup;
 import org.alfresco.transform.client.registry.CombinedConfig;
 import org.alfresco.transform.client.model.config.TransformOption;
@@ -474,17 +473,4 @@ public class LocalTransformServiceRegistry extends TransformServiceRegistryImpl
         }
         return localTransform;
     }
-
-    /**
-     * Returns {@code true} if the {@code function} is supported by the transform. Not all transforms are
-     * able to support all functionality, as newer features may have been introduced into the core t-engine code since
-     * it was released.
-     * @param function to be checked.
-     * @param transform the local transform.
-     * @return {@code true} is supported, {@code false} otherwise.
-     */
-    boolean isSupported(CoreFunction function, LocalTransform transform)
-    {
-        return isSupported(function, transform.getName());
-    }
 }

repository/src/main/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java

@@ -352,20 +352,13 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
         }
 
         /**
-         * Looks the entity up based on the ContentURL of the given node
+         * Looks the node up based on the NodeRef of the given node
          */
         @Override
         public Pair<Long, ContentUrlEntity> findByValue(ContentUrlEntity entity)
         {
             String contentUrl = entity.getContentUrl();
             ContentUrlEntity ret = getContentUrlEntity(contentUrl);
-            // Validate if this entity has exactly the value we are looking for or if it is a CRC collision
-            if (ret != null && !entity.getContentUrl().equals(ret.getContentUrl()))
-            {
-                throw new IllegalArgumentException("Collision detected for this contentURL. '" + entity.getContentUrl()
-                        + "' collides with existing contentURL '" + ret.getContentUrl() + "'. (ContentUrlShort;ContentUrlCrc) pair collision: ('"
-                        + entity.getContentUrlShort() + "';'" + entity.getContentUrlCrc() + "')");
-            }
             return (ret != null ? new Pair<Long, ContentUrlEntity>(ret.getId(), ret) : null);
         }
 

repository/src/main/java/org/alfresco/repo/module/tool/InstalledFiles.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import java.io.BufferedReader;

repository/src/main/java/org/alfresco/repo/module/tool/ModuleDetailsHelper.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import java.io.FileNotFoundException;
@@ -178,13 +178,13 @@ public class ModuleDetailsHelper
     }
     
     /**
-     * Saves the module details to the war in the correct location based on the module id
-     * 
-     * @param warLocation   the war location
-     * @param moduleDetails      the module id
-     */
-    public static void saveModuleDetails(String warLocation, ModuleDetails moduleDetails)
-    {
+     * Saves the module details to the war in the correct location based on the module id
+     * 
+     * @param warLocation   the war location
+     * @param moduleDetails      the module id
+     */
+    public static void saveModuleDetails(String warLocation, ModuleDetails moduleDetails)
+    {
         // Ensure that it is a valid set of properties
         String moduleId = moduleDetails.getId();
         try

repository/src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import de.schlichtherle.truezip.file.*;

repository/src/main/java/org/alfresco/repo/module/tool/WarHelper.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import org.alfresco.service.cmr.module.ModuleDetails;

repository/src/main/java/org/alfresco/repo/module/tool/WarHelperImpl.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import de.schlichtherle.truezip.file.TArchiveDetector;

repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java

@@ -1,106 +1,106 @@
-/*
+/*
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
  * the paid license agreement will prevail.  Otherwise, the software is 
  * provided under the following open source license terms:
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.node.db;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.domain.node.ChildAssocEntity;
-import org.alfresco.repo.domain.node.Node;
-import org.alfresco.repo.domain.node.NodeDAO;
-import org.alfresco.repo.domain.node.NodeDAO.ChildAssocRefQueryCallback;
-import org.alfresco.repo.domain.node.NodeExistsException;
-import org.alfresco.repo.domain.qname.QNameDAO;
-import org.alfresco.repo.node.AbstractNodeServiceImpl;
-import org.alfresco.repo.node.StoreArchiveMap;
-import org.alfresco.repo.node.archive.NodeArchiveService;
-import org.alfresco.repo.node.db.NodeHierarchyWalker.VisitedNode;
-import org.alfresco.repo.node.db.traitextender.NodeServiceExtension;
-import org.alfresco.repo.node.db.traitextender.NodeServiceTrait;
-import org.alfresco.repo.policy.BehaviourFilter;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
-import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.repo.transaction.TransactionalResourceHelper;
-import org.alfresco.service.cmr.dictionary.AspectDefinition;
-import org.alfresco.service.cmr.dictionary.AssociationDefinition;
-import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition;
-import org.alfresco.service.cmr.dictionary.ClassDefinition;
-import org.alfresco.service.cmr.dictionary.InvalidAspectException;
-import org.alfresco.service.cmr.dictionary.InvalidTypeException;
-import org.alfresco.service.cmr.dictionary.PropertyDefinition;
-import org.alfresco.service.cmr.dictionary.TypeDefinition;
-import org.alfresco.service.cmr.repository.AssociationExistsException;
-import org.alfresco.service.cmr.repository.AssociationRef;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
-import org.alfresco.service.cmr.repository.InvalidChildAssociationRefException;
-import org.alfresco.service.cmr.repository.InvalidNodeRefException;
-import org.alfresco.service.cmr.repository.InvalidStoreRefException;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeRef.Status;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.Path;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
-import org.alfresco.service.cmr.security.AccessPermission;
-import org.alfresco.service.cmr.security.AccessStatus;
-import org.alfresco.service.cmr.security.OwnableService;
-import org.alfresco.service.cmr.security.PermissionService;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.service.namespace.QNamePattern;
-import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.traitextender.AJProxyTrait;
-import org.alfresco.traitextender.Extend;
-import org.alfresco.traitextender.ExtendedTrait;
-import org.alfresco.traitextender.Extensible;
-import org.alfresco.traitextender.Trait;
-import org.alfresco.util.EqualsHelper;
-import org.alfresco.util.GUID;
-import org.alfresco.util.Pair;
-import org.alfresco.util.ParameterCheck;
-import org.alfresco.util.PropertyMap;
-import org.alfresco.util.transaction.TransactionListenerAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.domain.node.ChildAssocEntity;
+import org.alfresco.repo.domain.node.Node;
+import org.alfresco.repo.domain.node.NodeDAO;
+import org.alfresco.repo.domain.node.NodeDAO.ChildAssocRefQueryCallback;
+import org.alfresco.repo.domain.node.NodeExistsException;
+import org.alfresco.repo.domain.qname.QNameDAO;
+import org.alfresco.repo.node.AbstractNodeServiceImpl;
+import org.alfresco.repo.node.StoreArchiveMap;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.node.db.NodeHierarchyWalker.VisitedNode;
+import org.alfresco.repo.node.db.traitextender.NodeServiceExtension;
+import org.alfresco.repo.node.db.traitextender.NodeServiceTrait;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.transaction.TransactionalResourceHelper;
+import org.alfresco.service.cmr.dictionary.AspectDefinition;
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.InvalidAspectException;
+import org.alfresco.service.cmr.dictionary.InvalidTypeException;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.AssociationExistsException;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.InvalidChildAssociationRefException;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.InvalidStoreRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeRef.Status;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.OwnableService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.QNamePattern;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.traitextender.AJProxyTrait;
+import org.alfresco.traitextender.Extend;
+import org.alfresco.traitextender.ExtendedTrait;
+import org.alfresco.traitextender.Extensible;
+import org.alfresco.traitextender.Trait;
+import org.alfresco.util.EqualsHelper;
+import org.alfresco.util.GUID;
+import org.alfresco.util.Pair;
+import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.transaction.TransactionListenerAdapter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
@@ -844,25 +844,26 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
         // get the node
         final Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef);
         final Long nodeId = nodePair.getFirst();
-
-        if (!nodeDAO.hasNodeAspect(nodeId, aspectTypeQName))
-        {
-            return;
-        }
+        
+        boolean hadAspect = nodeDAO.hasNodeAspect(nodeId, aspectTypeQName);
+        
         // Invoke policy behaviours
         invokeBeforeUpdateNode(nodeRef);
-        invokeBeforeRemoveAspect(nodeRef, aspectTypeQName);
-        nodeDAO.removeNodeAspects(nodeId, Collections.singleton(aspectTypeQName));
-
+        if (hadAspect)
+        {
+            invokeBeforeRemoveAspect(nodeRef, aspectTypeQName);
+            nodeDAO.removeNodeAspects(nodeId, Collections.singleton(aspectTypeQName));
+        }
+        
         AspectDefinition aspectDef = dictionaryService.getAspect(aspectTypeQName);
         boolean updated = false;
         if (aspectDef != null)
         {
             // Remove default properties
-            Map<QName, PropertyDefinition> propertyDefs = aspectDef.getProperties();
+            Map<QName,PropertyDefinition> propertyDefs = aspectDef.getProperties();
             Set<QName> propertyToRemoveQNames = propertyDefs.keySet();
             nodeDAO.removeNodeProperties(nodeId, propertyToRemoveQNames);
-
+            
             // Remove child associations
             // We have to iterate over the associations and remove all those between the parent and child
             final List<Pair<Long, ChildAssociationRef>> assocsToDelete = new ArrayList<Pair<Long, ChildAssociationRef>>(5);
@@ -874,24 +875,29 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                     return true;
                 }
 
-                @Override public boolean orderResults()
+                @Override
+                public boolean orderResults()
                 {
                     return false;
                 }
 
-                public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair, Pair<Long, NodeRef> parentNodePair,
-                            Pair<Long, NodeRef> childNodePair)
+                public boolean handle(
+                        Pair<Long, ChildAssociationRef> childAssocPair,
+                        Pair<Long, NodeRef> parentNodePair,
+                        Pair<Long, NodeRef> childNodePair
+                        )
                 {
                     if (isPendingDelete(parentNodePair.getSecond()) || isPendingDelete(childNodePair.getSecond()))
                     {
                         if (logger.isTraceEnabled())
                         {
-                            logger.trace("Aspect-triggered association removal: "
-                                        + "Ignoring child associations where one of the nodes is pending delete: " + childAssocPair);
+                            logger.trace(
+                                    "Aspect-triggered association removal: " +
+                                    "Ignoring child associations where one of the nodes is pending delete: " + childAssocPair);
                         }
                         return true;
                     }
-
+                    
                     // Double check that it's not a primary association.  If so, we can't delete it and
                     //    have to delete the child node directly and with full archival.
                     if (childAssocPair.getSecond().isPrimary())
@@ -908,7 +914,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
 
                 public void done()
                 {
-                }
+                }                               
             };
             // Get all the QNames to remove
             Set<QName> assocTypeQNamesToRemove = new HashSet<QName>(aspectDef.getChildAssociations().keySet());
@@ -924,14 +930,14 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                 nodeDAO.deleteChildAssoc(assocId);
                 invokeOnDeleteChildAssociation(assocRef);
             }
-
+            
             // Cascade-delete any nodes that were attached to primary associations
             for (Pair<Long, NodeRef> childNodePair : nodesToDelete)
             {
                 NodeRef childNodeRef = childNodePair.getSecond();
                 this.deleteNode(childNodeRef);
             }
-
+            
             // Gather peer associations to delete
             Map<QName, AssociationDefinition> nodeAssocDefs = aspectDef.getAssociations();
             List<Long> nodeAssocIdsToRemove = new ArrayList<Long>(13);
@@ -943,8 +949,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                     if (logger.isTraceEnabled())
                     {
                         logger.trace(
-                                    "Aspect-triggered association removal: " + "Ignoring peer associations where one of the nodes is pending delete: "
-                                                + nodeRef);
+                                "Aspect-triggered association removal: " +
+                                "Ignoring peer associations where one of the nodes is pending delete: " + nodeRef);
                     }
                     continue;
                 }
@@ -961,8 +967,9 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                     {
                         if (logger.isTraceEnabled())
                         {
-                            logger.trace("Aspect-triggered association removal: "
-                                        + "Ignoring peer associations where one of the nodes is pending delete: " + assocPair);
+                            logger.trace(
+                                    "Aspect-triggered association removal: " +
+                                    "Ignoring peer associations where one of the nodes is pending delete: " + assocPair);
                         }
                         continue;
                     }
@@ -983,15 +990,16 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
             }
             updated = updated || assocsDeleted > 0;
         }
-
+        
         // Invoke policy behaviours
         if (updated)
         {
             invokeOnUpdateNode(nodeRef);
         }
-
-        invokeOnRemoveAspect(nodeRef, aspectTypeQName);
-
+        if (hadAspect)
+        {
+            invokeOnRemoveAspect(nodeRef, aspectTypeQName);
+        }
     }
 
     /**

repository/src/main/java/org/alfresco/repo/rendition2/SwitchingTransformServiceRegistry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -25,7 +25,6 @@
  */
 package org.alfresco.repo.rendition2;
 
-import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.transform.client.registry.TransformServiceRegistry;
 
 import java.util.Map;
@@ -79,10 +78,4 @@ public class SwitchingTransformServiceRegistry implements TransformServiceRegist
         }
         return name;
     }
-
-    @Override
-    public boolean isSupported(CoreFunction function, String transformerName)
-    {
-        return primary.isSupported(function, transformerName) && secondary.isSupported(function, transformerName);
-    }
 }

repository/src/main/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java

@@ -43,6 +43,7 @@ import org.alfresco.repo.domain.tenant.TenantEntity;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.transaction.TransactionService;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -275,6 +276,7 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
     /**
      * {@inheritDoc}
      */
+    @Experimental
     @Override
     public Map<String, String> getStorageProperties(String contentUrl)
     {
@@ -285,6 +287,7 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
     {
         return getTenantContentStore().requestSendContentToArchive(contentUrl, archiveParams);
@@ -294,6 +297,7 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
      * {@inheritDoc}
      */
     @Override
+    @Experimental
     public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
     {
         return getTenantContentStore().requestRestoreContentFromArchive(contentUrl, restoreParams);

repository/src/main/java/org/alfresco/service/cmr/repository/ContentService.java

@@ -29,6 +29,7 @@ package org.alfresco.service.cmr.repository;
 import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.Auditable;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.dictionary.InvalidTypeException;
 import org.alfresco.service.namespace.QName;
 
@@ -259,6 +260,7 @@ public interface ContentService
      * @return Returns a key-value (String-String) collection of storage headers/properties with their respective values for a given {@link NodeRef}.
      */
     @Auditable(parameters = {"nodeRef", "propertyQName"})
+    @Experimental
     default Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName)
     {
         return Collections.emptyMap();
@@ -268,6 +270,7 @@ public interface ContentService
      * Submit a request to send content to archive (offline) state.
      * If no connector is present or connector is not supporting sending to archive, then {@link UnsupportedOperationException} will be returned.
      * Specific connector will decide which storage class/tier will be set for content.
+     * This method is experimental and subject to changes.
      *
      * @param nodeRef a reference to a node having a content property
      * @param propertyQName the name of the property, which must be of type <b>content</b>
@@ -276,6 +279,7 @@ public interface ContentService
      * @throws UnsupportedOperationException when method not implemented
      */
     @Auditable(parameters = {"nodeRef", "propertyQName", "archiveParams"})
+    @Experimental
     default boolean requestSendContentToArchive(NodeRef nodeRef, QName propertyQName,
                                                 Map<String, Serializable> archiveParams)
     {
@@ -289,6 +293,7 @@ public interface ContentService
      * Keys of this map should be restricted to {@code ContentRestoreParams} enumeration.
      * For AWS S3 map can indicating expiry days, Glacier restore tier.
      * For Azure Blob map can indicate rehydrate priority.
+     * This method is experimental and subject to changes.
      *
      * @param nodeRef a reference to a node having a content property
      * @param propertyQName the name of the property, which must be of type <b>content</b>
@@ -297,6 +302,7 @@ public interface ContentService
      * @throws UnsupportedOperationException when method not implemented
      */
     @Auditable(parameters = {"nodeRef", "propertyQName", "restoreParams"})
+    @Experimental
     default boolean requestRestoreContentFromArchive(NodeRef nodeRef, QName propertyQName, Map<String, Serializable> restoreParams)
     {
         throw new UnsupportedOperationException("Request to restore content from archive is not supported by content service.");

repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java

@@ -47,8 +47,6 @@ import java.io.StringReader;
 import java.util.Collections;
 import java.util.List;
 
-import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG_LATEST;
-
 /**
  * This class reads multiple T-Engine config and local files and registers as if they were all
  * in one file. Transform options are shared between all sources.<p>
@@ -106,7 +104,7 @@ public class CombinedConfig extends CombinedTransformConfig
 
     private boolean addRemoteConfig(String baseUrl, String remoteType)
     {
-        String url = baseUrl + (baseUrl.endsWith("/") ? "" : "/") + ENDPOINT_TRANSFORM_CONFIG_LATEST;
+        String url = baseUrl + (baseUrl.endsWith("/") ? "" : "/") + "transform/config";
         HttpGet httpGet = new HttpGet(url);
         boolean successReadingConfig = true;
         try

repository/src/main/resources/alfresco/bootstrap/sitesSpace.xml

@@ -33,12 +33,9 @@
                      <view:properties>
                         <cm:description></cm:description>
                         <cm:name>extensions</cm:name>
-                        <cm:isIndexed>false</cm:isIndexed>
-                        <cm:isContentIndexed>false</cm:isContentIndexed>
                      </view:properties>
                      <view:aspects>
                         <sys:hidden/>
-                        <cm:indexControl/>
                     </view:aspects>
                   </cm:folder>
                </cm:contains>
@@ -53,12 +50,9 @@
                      <view:properties>
                         <cm:description></cm:description>
                         <cm:name>module-deployments</cm:name>
-                        <cm:isIndexed>false</cm:isIndexed>
-                        <cm:isContentIndexed>false</cm:isContentIndexed>
                      </view:properties>
                      <view:aspects>
                         <sys:hidden/>
-                        <cm:indexControl/>
                     </view:aspects>
                   </cm:folder>
                </cm:contains>

repository/src/test/java/org/alfresco/AllUnitTestsSuite.java

@@ -66,6 +66,9 @@ import org.junit.runners.Suite;
     org.alfresco.repo.management.subsystems.CryptodocSwitchableApplicationContextFactoryTest.class,
     org.alfresco.repo.module.ModuleDetailsImplTest.class,
     org.alfresco.repo.module.ModuleVersionNumberTest.class,
+    org.alfresco.repo.module.tool.ModuleManagementToolTest.class,
+    org.alfresco.repo.module.tool.WarHelperImplTest.class,
+    org.alfresco.repo.module.tool.ModuleServiceImplTest.class,
     org.alfresco.repo.node.integrity.IntegrityEventTest.class,
     org.alfresco.repo.policy.MTPolicyComponentTest.class,
     org.alfresco.repo.policy.PolicyComponentTest.class,
@@ -116,7 +119,6 @@ import org.junit.runners.Suite;
     org.alfresco.util.schemacomp.validator.SchemaVersionValidatorTest.class,
     org.alfresco.util.schemacomp.validator.TypeNameOnlyValidatorTest.class,
     org.alfresco.util.test.OmittedTestClassFinderUnitTest.class,
-    org.alfresco.util.test.junitrules.RetryAtMostRuleTest.class,
     org.alfresco.util.test.junitrules.TemporaryMockOverrideTest.class,
     org.alfresco.repo.search.impl.solr.AbstractSolrQueryHTTPClientTest.class,
     org.alfresco.repo.search.impl.solr.SpellCheckDecisionManagerTest.class,

repository/src/test/java/org/alfresco/AppContext01TestSuite.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -68,10 +68,6 @@ import org.junit.runners.Suite;
     org.alfresco.filesys.repo.ContentDiskDriverTest.class,
     org.alfresco.filesys.repo.LockKeeperImplTest.class,
     org.alfresco.repo.activities.ActivityServiceImplTest.class,
-    org.alfresco.repo.activities.feed.cleanup.FeedCleanerTestCaseInsensitivity.class,
-    org.alfresco.repo.activities.SiteActivityTestCaseSensitivity.class,
-    org.alfresco.repo.activities.feed.cleanup.FeedCleanerTestCaseSensitivity.class,
-    org.alfresco.repo.activities.SiteActivityTestCaseInsensitivity.class,
     org.alfresco.repo.admin.registry.RegistryServiceImplTest.class
 })
 public class AppContext01TestSuite

repository/src/test/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java

@@ -31,12 +31,10 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
-import org.alfresco.util.PropertyMap;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -132,56 +130,4 @@ public class RemoveFeaturesActionExecuterTest extends BaseSpringTest
         action2.setParameterValue(RemoveFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_VERSIONABLE);
         this.executer.execute(action2, this.nodeRef);
     }
-
-    /**
-     * Test removing aspect properties
-     */
-    @Test
-    public void testRemovingAspectPropertiesAfterExecution()
-    {
-        QName QNAME_PUBLISHER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "publisher");
-        QName QNAME_SUBJECT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "subject");
-
-        // Execute the action
-        PropertyMap dublinCoreProperties = new PropertyMap(2);
-        dublinCoreProperties.put(QNAME_PUBLISHER, "publisher");
-        dublinCoreProperties.put(QNAME_SUBJECT, "subject");
-        nodeService.addAspect(nodeRef, ContentModel.ASPECT_DUBLINCORE, dublinCoreProperties);
-
-        // Check that the node has aspect properties
-        assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_DUBLINCORE));
-        assertTrue(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_PUBLISHER));
-        assertTrue(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_SUBJECT));
-
-        // Remove the aspect
-        ActionImpl action = new ActionImpl(null, ID, RemoveFeaturesActionExecuter.NAME, null);
-        action.setParameterValue(RemoveFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_DUBLINCORE);
-        this.executer.execute(action, this.nodeRef);
-
-        // Check that the node now no longer has aspect properties
-        assertFalse(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_PUBLISHER));
-        assertFalse(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_SUBJECT));
-    }
-
-    /**
-     * Test removing not added child aspect
-     */
-    @Test
-    public void testRemovingNotAddedChildAspect()
-    {
-        QName QNAME_TITLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "title");
-
-        // Execute the action
-        PropertyMap titledProperties = new PropertyMap(1);
-        titledProperties.put(QNAME_TITLE, "title");
-        nodeService.addAspect(nodeRef, ContentModel.ASPECT_TITLED, titledProperties);
-
-        // Remove the child aspect which has not been added to the node
-        ActionImpl action = new ActionImpl(null, ID, RemoveFeaturesActionExecuter.NAME, null);
-        action.setParameterValue(RemoveFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_DUBLINCORE);
-        this.executer.execute(action, this.nodeRef);
-
-        // Now check that the node has parent aspect properties
-        assertTrue(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_TITLE));
-    }
 }

repository/src/test/java/org/alfresco/repo/activities/AbstractSiteActivityTest.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.activities;
 
 import static org.junit.Assert.*;
@@ -102,11 +102,19 @@ public abstract class AbstractSiteActivityTest
     // AppToolId for site membership activities
     private static String appToolId = "siteService"; // refer to SiteService
     
+    private static boolean membersAddedUpdated = false;
+    private static boolean membersRemoved = false;
+    private static boolean controlsCreated = false;
+    
+    public AbstractSiteActivityTest()
+    {
+    }
+    
     @Before
     public void setUp() throws Exception
     {
         applicationContext = ApplicationContextHelper.getApplicationContext();
-        String testid = "" + System.currentTimeMillis();
+        String testid = ""+System.currentTimeMillis();
         
         // Let's shut down the scheduler so that we aren't competing with the scheduled versions of the post lookup and
         // feed generator jobs
@@ -181,6 +189,10 @@ public abstract class AbstractSiteActivityTest
         deleteSite(site1); 
         deleteSite(site2);
         deleteSite(site3);
+        
+        membersAddedUpdated  = false;
+        membersRemoved = false;
+        controlsCreated = false;
     }
     
     protected void createSite(String siteId, boolean isPublic) throws Exception
@@ -320,39 +332,51 @@ public abstract class AbstractSiteActivityTest
         }
         assertEquals(expectedCount, activityService.getUserFeedEntries(userId, siteId, excludeThisUser, excludeOtherUsers, null, null).size());
     }
-
-    public void configureFeedControls() throws Exception
+    
+    @Test
+    public void testUserFeedControls() throws Exception
     {
-        // user 1 opts out of all activities for site 1
-        login(user1, USER_PW);
-        addFeedControl(site1, null);
-
-        // user 2 opts out of site membership activities (across all sites)
-        login(user2, USER_PW);
-        addFeedControl(null, appToolId);
-
-        // user 3 opts out of site membership activities for site 1 only
-        login(user3, USER_PW);
-        addFeedControl(site1, appToolId);
-
-        // TODO add more here, once we have more appToolIds
+        if (! controlsCreated)
+        {
+            // user 1 opts out of all activities for site 1
+            login(user1, USER_PW);
+            addFeedControl(site1, null);
+            
+            // user 2 opts out of site membership activities (across all sites)
+            login(user2, USER_PW);
+            addFeedControl(null, appToolId);
+            
+            // user 3 opts out of site membership activities for site 1 only
+            login(user3, USER_PW);
+            addFeedControl(site1, appToolId);
+                 
+            // TODO add more here, once we have more appToolIds
+            
+            controlsCreated = true;
+        }
     }
-
-    public void addAndUpdateMemberships() throws Exception
+    
+    @Test
+    public void testAddAndUpdateMemberships() throws Exception
     {
-        login(ADMIN_USER, ADMIN_PW);
-
-        addAndUpdateMemberships(site1, true);  // public site, include all users
-        addAndUpdateMemberships(site2, true);  // private site, include all users
-        addAndUpdateMemberships(site3, false); // private site, do not include user 4
-
-        generateFeed();
+        if (! membersAddedUpdated)
+        {
+            login(ADMIN_USER, ADMIN_PW);
+           
+            addAndUpdateMemberships(site1, true);  // public site, include all users
+            addAndUpdateMemberships(site2, true);  // private site, include all users
+            addAndUpdateMemberships(site3, false); // private site, do not include user 4
+            
+            generateFeed();
+            
+            membersAddedUpdated = true;
+        }
     }
     
     @Test
     public void testGetSiteFeedsAfterAddAndUpdateMemberships() throws Exception
     {
-        addAndUpdateMemberships();
+        testAddAndUpdateMemberships();
         
         login(ADMIN_USER, ADMIN_PW);
         
@@ -376,9 +400,14 @@ public abstract class AbstractSiteActivityTest
             // ignore
         }
     }
-
-    public void removeMemberships() throws Exception
+    
+    @Test
+    public void testRemoveMemberships() throws Exception
     {
+        if (! membersRemoved)
+        {
+            testAddAndUpdateMemberships();
+            
             login(ADMIN_USER, ADMIN_PW);
             
             removeMemberships(site1, true);
@@ -386,6 +415,9 @@ public abstract class AbstractSiteActivityTest
             removeMemberships(site3, false);
             
             generateFeed();
+            
+            membersRemoved = true;
+        }
     }
     
     protected void addAndUpdateMemberships(String siteId, boolean includeUser4) throws Exception
@@ -424,8 +456,8 @@ public abstract class AbstractSiteActivityTest
     @Test
     public void testGetSiteFeedsAfterRemoveMemberships() throws Exception
     {
-        addAndUpdateMemberships();
-        removeMemberships();
+        testAddAndUpdateMemberships();
+        testRemoveMemberships();
         
         login(ADMIN_USER, ADMIN_PW);
         
@@ -461,11 +493,11 @@ public abstract class AbstractSiteActivityTest
     }
     
     @Test
-    public void testGetUserFeedsAfterApplyingFeedControls() throws Exception
+    public void testGetUserFeedsAfter() throws Exception
     {
-        configureFeedControls();
-        addAndUpdateMemberships();
-        removeMemberships();
+        testUserFeedControls();
+        testAddAndUpdateMemberships();
+        testRemoveMemberships();
         
         // as admin
         
@@ -474,23 +506,22 @@ public abstract class AbstractSiteActivityTest
         // site 1, with 4 users, each with 1 join, 1 role change = 4x2 = 8
         // site 2, with 4 users, each with 1 join, 1 role change = 4x2 = 8
         // site 3, with 3 users, each with 1 join, 1 role change = 3x2 = 6
-        // Every user is removed from sites so in its feed it sees the removal for each site
         
-        // user 1 belongs to 3 sites and is removed from 3 sites  = (2x8)+(1x6)+3 = 25
-        // user 2 belongs to 3 sites and is removed from 3 sites = (2x8)+(1x6)+3 = 25
-        // user 3 belongs to 3 sites and is removed from 3 sites = (2x8)+(1x6)+3 = 25
-        // user 4 belongs to 2 sites and is removed from 3 sites = (2x8)+2 = 18
-
-        getUserFeed(user1, true, 16);  // 16 = (25 - 9) due to feed control - exclude site 1 (4 joins, 4 changes, 1 removal)
+        // user 1 belongs to 3 sites = (2x8)+(1x6) = 22
+        // user 2 belongs to 3 sites = (2x8)+(1x6) = 22
+        // user 3 belongs to 3 sites = (2x8)+(1x6) = 22
+        // user 4 belongs to 2 sites = (2x8) = 16
+        
+        getUserFeed(user1, true, 14);  // 14 = (22 - 8) due to feed control - exclude site 1
         getUserFeed(user2, true, 0);   // 0 = due to feed control - exclude site membership activities (across all sites)
-        getUserFeed(user3, true, 16);  // 16 = (25 - 9) due to feed control - exclude site membership activities for site 1
-        getUserFeed(user4, true, 18);  // 18 = no feed control
+        getUserFeed(user3, true, 14);  // 14 = (22 - 8) due to feed control - exclude site membership activities for site 1
+        getUserFeed(user4, true, 16);  // 16 = no feed control
         
         // as user1
         
         login(user1, USER_PW);
         
-        getUserFeed(user1, false, 16);
+        getUserFeed(user1, false, 14);
         
         // as user2
         
@@ -498,7 +529,7 @@ public abstract class AbstractSiteActivityTest
         
         try
         {
-            getUserFeed(user1, true, 16);
+            getUserFeed(user1, true, 14);
             
             fail("User feed should only be accessible to user or an admin");
         }
@@ -512,12 +543,12 @@ public abstract class AbstractSiteActivityTest
         login(user1, USER_PW);
         
         getUserFeed(null, site1, false, false, false, 0);
-        getUserFeed(null, site2, false, false, false, 9);
-        getUserFeed(null, site3, false, false, false, 7);
+        getUserFeed(null, site2, false, false, false, 8);
+        getUserFeed(null, site3, false, false, false, 6);
         
-        getUserFeed(null, null, false, false, false, 16); // no filter
+        getUserFeed(null, null, false, false, false, 14); // no filter
         getUserFeed(null, null, false, true, false, 12);  // exclude any from user1
-        getUserFeed(null, null, false, false, true, 4);   // exclude all except user1
+        getUserFeed(null, null, false, false, true, 2);   // exclude all except user1
         getUserFeed(null, null, false, true, true, 0);    // exclude all (NOOP)
         
         // TODO - add more (eg. other non-admin user activities)

repository/src/test/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java

@@ -4,32 +4,27 @@
  * %%
  * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
  * provided under the following open source license terms:
- *
+ * 
  * Alfresco is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
+ * 
  * Alfresco is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
 package org.alfresco.repo.domain.permissions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -66,26 +61,23 @@ import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.Pair;
-import org.alfresco.util.test.junitrules.RetryAtMostRule;
-import org.alfresco.util.test.junitrules.RetryAtMostRule.RetryAtMost;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.dao.ConcurrencyFailureException;
 
+import junit.framework.TestCase;
+
 /**
  * Test class for {@link FixedAclUpdater}
- *
+ * 
  * @author Andreea Dragoi
  * @author sglover
  * @since 4.2.7
  *
  */
-public class FixedAclUpdaterTest
+public class FixedAclUpdaterTest extends TestCase
 {
     private static final Logger LOG = LoggerFactory.getLogger(FixedAclUpdaterTest.class);
 
@@ -111,10 +103,7 @@ public class FixedAclUpdaterTest
     private static String TEST_GROUP_NAME_FULL = PermissionService.GROUP_PREFIX + TEST_GROUP_NAME;
     private static String DEFAULT_PERMISSION = PermissionService.CONTRIBUTOR;
 
-    @Rule
-    public RetryAtMostRule retryAtMostRule = new RetryAtMostRule();
-
-    @Before
+    @Override
     public void setUp() throws Exception
     {
         ctx = ApplicationContextHelper.getApplicationContext();
@@ -137,7 +126,7 @@ public class FixedAclUpdaterTest
         setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, maxTransactionTime);
     }
 
-    @After
+    @Override
     public void tearDown() throws Exception
     {
         AuthenticationUtil.clearCurrentSecurityContext();
@@ -213,7 +202,6 @@ public class FixedAclUpdaterTest
      * Test setting permissions explicitly as async
      */
     @Test
-    @RetryAtMost(3)
     public void testAsync()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncFolder");
@@ -260,7 +248,6 @@ public class FixedAclUpdaterTest
      * MNT-21847 - Create a new content in folder that has the aspect applied
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeCreation()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeCreationFolder");
@@ -291,7 +278,6 @@ public class FixedAclUpdaterTest
      * MNT-22009 - Delete node that has the aspect applied before job runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeDeletion()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeDeletionFolder");
@@ -382,7 +368,6 @@ public class FixedAclUpdaterTest
      * MNT-22040 - Copy node that has the aspect applied before job runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeCopy()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeCopyOriginFolder");
@@ -462,7 +447,6 @@ public class FixedAclUpdaterTest
      * Copy node that has the aspect to another folder that also has the aspect applied before job runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeCopyToPendingFolder()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeCopyOriginFolder");
@@ -554,7 +538,6 @@ public class FixedAclUpdaterTest
      * runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeCopyParentToChildPendingFolder()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeCopyOriginFolder");
@@ -666,7 +649,6 @@ public class FixedAclUpdaterTest
      * runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeMoveChildToChildPendingFolder()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeMoveChildToChildPendingFolderOrigin");
@@ -752,7 +734,6 @@ public class FixedAclUpdaterTest
      * ACL
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithErrorsForceSharedACL()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithErrorsForceSharedACL");
@@ -811,7 +792,6 @@ public class FixedAclUpdaterTest
      * MNT-22040 - Move node that has the aspect applied before job runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeMove()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeMoveOriginFolder");
@@ -888,7 +868,6 @@ public class FixedAclUpdaterTest
      * Move node that has the aspect to another folder that also has the aspect applied before job runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeMoveToPendingFolder()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeMoveOriginFolder");
@@ -977,7 +956,6 @@ public class FixedAclUpdaterTest
      * Lock node that has the aspect applied before job runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeLock()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFileTests("testAsyncWithNodeLockFolder");
@@ -1007,7 +985,6 @@ public class FixedAclUpdaterTest
      * Checkout a node for editing that has the aspect applied before job runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeCheckout()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFileTests("testAsyncWithNodeCheckoutFolder");
@@ -1038,7 +1015,6 @@ public class FixedAclUpdaterTest
      * Update the permissions of a node that has the aspect applied (new permissions: fixed)
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeUpdatePermissionsFixed()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeUpdatePermissionsFixedFolder");
@@ -1080,7 +1056,6 @@ public class FixedAclUpdaterTest
      * Update the permissions of a node that has the aspect applied (new permissions: shared)
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeUpdatePermissionsShared()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithNodeUpdatePermissionsSharedFolder");
@@ -1119,7 +1094,6 @@ public class FixedAclUpdaterTest
      * Update the permissions of the parent of a node that has the aspect applied (new permissions: fixed)
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithParentUpdatePermissionsFixed()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithParentUpdatePermissionsFixedFolder");
@@ -1161,7 +1135,6 @@ public class FixedAclUpdaterTest
      * Update the permissions of the parent of a node that has the aspect applied (new permissions: shared)
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithParentUpdatePermissionsShared()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncWithParentUpdatePermissionsSharedFolder");
@@ -1200,7 +1173,6 @@ public class FixedAclUpdaterTest
     }
 
     @Test
-    @RetryAtMost(3)
     public void testAsyncCascadeUpdatePermissions()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncCascadeUpdatePermissionsFolder");
@@ -1253,7 +1225,6 @@ public class FixedAclUpdaterTest
      * Update the content of a node that has the aspect applied before job runs
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncWithNodeContentUpdate()
     {
         NodeRef folderRef = createFolderHierarchyInRootForFileTests("testAsyncWithNodeContentUpdateFolder");
@@ -1286,7 +1257,6 @@ public class FixedAclUpdaterTest
      * Test setting permissions concurrently to actually cause the expected concurrency exception
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncConcurrentPermissionsUpdate() throws Throwable
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncConcurrentPermissionsUpdateFolder");
@@ -1358,7 +1328,6 @@ public class FixedAclUpdaterTest
      * exception but the job should be able to recover
      */
     @Test
-    @RetryAtMost(3)
     public void testAsyncConcurrentUpdateAndJob() throws Throwable
     {
         NodeRef folderRef = createFolderHierarchyInRootForFolderTests("testAsyncConcurrentUpdateAndJobFolder");
@@ -1833,7 +1802,7 @@ public class FixedAclUpdaterTest
 
     /**
      * Creates a level in folder/file hierarchy. Intermediate levels will contain folders and last ones files
-     *
+     * 
      * @param fileFolderService
      * @param parent
      *            - parent node of the of hierarchy level

repository/src/test/java/org/alfresco/repo/importer/ImporterComponentTest.java

@@ -113,31 +113,6 @@ public class ImporterComponentTest extends BaseSpringTest
         importerService.importView(testReader, location, null, new ImportTimerProgress());
         System.out.println(NodeStoreInspector.dumpNodeStore(nodeService, storeRef));
     }
-
-    @Test
-    public void testImportNotIndexedSubfolder() throws Exception
-    {
-        InputStream test = getClass().getClassLoader().getResourceAsStream(
-            "org/alfresco/repo/importer/import_not_indexed_subfolder.xml");
-
-        try (InputStreamReader testReader = new InputStreamReader(test, "UTF-8"))
-        {
-            Location location = new Location(storeRef);
-            importerService.importView(testReader, location, null, new ImportTimerProgress());
-            NodeRef rootNodeRef = nodeService.getRootNode(storeRef);
-            NodeRef testParentFolderRef = nodeService.getChildAssocs(rootNodeRef).get(0).getChildRef();
-            NodeRef testSubfolderRef = nodeService.getChildAssocs(testParentFolderRef).get(0).getChildRef();
-
-            assertFalse("The node's isIndexed property should be false.",
-                DefaultTypeConverter.INSTANCE.convert(Boolean.class,
-                    nodeService.getProperty(testSubfolderRef, ContentModel.PROP_IS_INDEXED)));
-            assertFalse("The node's isContentIndexed property should be false.",
-                DefaultTypeConverter.INSTANCE.convert(Boolean.class,
-                    nodeService.getProperty(testSubfolderRef, ContentModel.PROP_IS_CONTENT_INDEXED)));
-            assertTrue("The node should be marked with the indexControl aspect.",
-                nodeService.getAspects(testSubfolderRef).contains(ContentModel.ASPECT_INDEX_CONTROL));
-        }
-    }
     
     @Test
     public void testImportWithAuditableProperties() throws Exception

repository/src/test/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 

repository/src/test/java/org/alfresco/repo/module/tool/ModuleServiceImplTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 

repository/src/test/java/org/alfresco/repo/module/tool/WarHelperImplTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 

repository/src/test/java/org/alfresco/repo/node/NodeServiceTest.java

@@ -41,7 +41,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -53,8 +52,6 @@ import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.cache.TransactionalCache;
 import org.alfresco.repo.cache.TransactionalCache.ValueHolder;
 import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.repo.domain.contentdata.ContentDataDAO;
-import org.alfresco.repo.domain.contentdata.ContentUrlEntity;
 import org.alfresco.repo.domain.node.Node;
 import org.alfresco.repo.domain.node.NodeDAO;
 import org.alfresco.repo.domain.node.NodeEntity;
@@ -98,9 +95,6 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.security.PersonService;
-import org.alfresco.service.cmr.version.Version;
-import org.alfresco.service.cmr.version.VersionHistory;
-import org.alfresco.service.cmr.version.VersionService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
@@ -151,15 +145,12 @@ public class NodeServiceTest
     private static ContentService contentService;
     private static PermissionService permissionService;
     private static NodeDAO nodeDAO;
-    private static VersionService versionService;
     private static TransactionService txnService;
     private static PolicyComponent policyComponent;
     private static CannedQueryDAO cannedQueryDAOForTesting;
     private static SimpleCache<Serializable, ValueHolder<Serializable>> nodesCache;
     private static SimpleCache<Serializable, ValueHolder<Serializable>> propsCache;
     private static SimpleCache<Serializable, ValueHolder<Serializable>> aspectsCache;
-    private static SimpleCache<Long, ContentUrlEntity> contentDataCache;
-    private static SimpleCache<Long, ContentUrlEntity> contentUrlCache;
     
     private static Long deletedTypeQNameId;
     
@@ -177,7 +168,6 @@ public class NodeServiceTest
         contentService = serviceRegistry.getContentService();
         permissionService = serviceRegistry.getPermissionService();
         nodeDAO = (NodeDAO) APP_CONTEXT_INIT.getApplicationContext().getBean("nodeDAO");
-        versionService = serviceRegistry.getVersionService();
         txnService = serviceRegistry.getTransactionService();
         policyComponent = (PolicyComponent) APP_CONTEXT_INIT.getApplicationContext().getBean("policyComponent");
         cannedQueryDAOForTesting = (CannedQueryDAO) APP_CONTEXT_INIT.getApplicationContext().getBean("cannedQueryDAOForTesting");
@@ -186,15 +176,11 @@ public class NodeServiceTest
         nodesCache = (SimpleCache<Serializable, ValueHolder<Serializable>>) APP_CONTEXT_INIT.getApplicationContext().getBean("node.nodesSharedCache");
         propsCache = (SimpleCache<Serializable, ValueHolder<Serializable>>) APP_CONTEXT_INIT.getApplicationContext().getBean("node.propertiesSharedCache");
         aspectsCache = (SimpleCache<Serializable, ValueHolder<Serializable>>) APP_CONTEXT_INIT.getApplicationContext().getBean("node.aspectsSharedCache");
-        contentDataCache = (SimpleCache<Long, ContentUrlEntity>) APP_CONTEXT_INIT.getApplicationContext().getBean("contentDataCache");
-        contentUrlCache = (SimpleCache<Long, ContentUrlEntity>) APP_CONTEXT_INIT.getApplicationContext().getBean("contentUrlCache");
         
         // Clear the caches to remove fluff
         nodesCache.clear();
         propsCache.clear();
         aspectsCache.clear();
-        contentDataCache.clear();
-        contentUrlCache.clear();
         
         AuthenticationUtil.setRunAsUserSystem();
         
@@ -2447,125 +2433,6 @@ public class NodeServiceTest
             return null;
         }, userName1);
     }
-    
-    /**
-     * See MNT-22710
-     */
-    @Test
-    public void testChangeContentURLSameCRC()
-    {
-        ContentPropertyRestrictionInterceptor contentPropertyRestrictionInterceptor =
-                (ContentPropertyRestrictionInterceptor) APP_CONTEXT_INIT.getApplicationContext().getBean("contentPropertyRestrictionInterceptor");
-
-        contentPropertyRestrictionInterceptor.setGlobalContentPropertyRestrictionWhiteList(this.getClass().getName());
-        
-        try
-        {
-            NodeRef workspaceRootNodeRef = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
-            Map<QName, Serializable> props = new HashMap<>(3);
-            props.put(ContentModel.PROP_NAME, GUID.generate());
-            NodeRef testFolder = nodeService.createNode(
-                    workspaceRootNodeRef,
-                    ContentModel.ASSOC_CHILDREN,
-                    QName.createQName(NAMESPACE, GUID.generate()),
-                    ContentModel.TYPE_FOLDER,
-                    props).getChildRef();
-             
-            NodeRef nodeRef1 = nodeService.createNode(
-                    testFolder,
-                    ContentModel.ASSOC_CONTAINS,
-                    QName.createQName("180225704974-DSA Correspondence 1"),
-                    ContentModel.TYPE_CONTENT).getChildRef();
-            
-            NodeRef nodeRef2 = nodeService.createNode(
-                    testFolder,
-                    ContentModel.ASSOC_CONTAINS,
-                    QName.createQName("090502800600-General Correspondence 1"),
-                    ContentModel.TYPE_CONTENT).getChildRef();
-            
-            // CRC: 2997538036
-            String contentURL1 = "s3v2://contentstore/1597325412593_1610985343942_3708/SLC/IC/DSA/2018/02/16/20/180225704974-DSA Correspondence 1";
-            // CRC: 2921900407
-            String contentURL2 = "s3v2://contentstore/1639588316822_1642775862393_49/SLC/IC/GENERAL/2009/05/27/16/090502800600-General Correspondence 1";
-            // CRC: 2997538036 (same CRC as contentURL1)
-            String contentURL3 = "s3v2://contentstore/1639588316821_1642775862393_49/SLC/IC/GENERAL/2009/05/27/16/090502800600-General Correspondence 1";
-            
-            ContentData contentData1 = new ContentData(
-                    contentURL1, 
-                    "application/pdf",
-                    100L, 
-                    "UTF-8"
-                    );
-            
-            ContentData contentData2 = new ContentData(
-                    contentURL2, 
-                    "application/pdf",
-                    100L, 
-                    "UTF-8"
-                    );
-            
-            ContentData contentData3 = new ContentData(
-                    contentURL3, 
-                    "application/pdf",
-                    100L, 
-                    "UTF-8"
-                    );
-            
-            // Setting same contentURLs
-            nodeService.setProperty(nodeRef1, ContentModel.PROP_CONTENT, contentData1);
-            nodeService.setProperty(nodeRef2, ContentModel.PROP_CONTENT, contentData1);
-            
-            //Validate the data
-            ContentData cdNode1Val0= (ContentData) nodeService.getProperty(nodeRef1, ContentModel.PROP_CONTENT);
-            ContentData cdNode2Val0= (ContentData) nodeService.getProperty(nodeRef2, ContentModel.PROP_CONTENT);
-            assertEquals("ContentURL for node1 should be contentURL1",contentURL1,cdNode1Val0.getContentUrl());
-            assertEquals("ContentURL for node2 should also be the same as node1",contentURL1,cdNode2Val0.getContentUrl());
-            
-            // Setting non colliding URLS
-            nodeService.setProperty(nodeRef2, ContentModel.PROP_CONTENT, contentData2);
-            
-            //Validate the data
-            ContentData cdNode1Val1= (ContentData) nodeService.getProperty(nodeRef1, ContentModel.PROP_CONTENT);
-            ContentData cdNode2Val1= (ContentData) nodeService.getProperty(nodeRef2, ContentModel.PROP_CONTENT);
-            assertEquals("ContentURL for node1 should be contentURL1",contentURL1,cdNode1Val1.getContentUrl());
-            assertEquals("ContentURL for node2 should be contentURL2",contentURL2,cdNode2Val1.getContentUrl());
-            
-            //Set a colliding URL
-            try
-            {
-                nodeService.setProperty(nodeRef2, ContentModel.PROP_CONTENT, contentData3);
-                fail("Should not be possible to set a contentUrl with the same CRC and different value");
-            }
-            catch (IllegalArgumentException e)
-            {
-                //Expected
-            }
-            
-            //Validate the contentURL values
-            ContentData cdNode1Val2= (ContentData) nodeService.getProperty(nodeRef1, ContentModel.PROP_CONTENT);
-            ContentData cdNode2Val2= (ContentData) nodeService.getProperty(nodeRef2, ContentModel.PROP_CONTENT);
-            assertFalse("Collision detected on node 1",contentURL3.equals(cdNode1Val2.getContentUrl()));
-            assertFalse("Collision detected on node 2",contentURL1.equals(cdNode2Val2.getContentUrl()));
-            
-            //Clear caches and validate again
-            propsCache.clear();
-            contentDataCache.clear();
-            contentUrlCache.clear();
-            
-            ContentData cdNode1Val3= (ContentData) nodeService.getProperty(nodeRef1, ContentModel.PROP_CONTENT);
-            ContentData cdNode2Val3= (ContentData) nodeService.getProperty(nodeRef2, ContentModel.PROP_CONTENT);
-            assertFalse("Collision detected on node 1 after clear caches",contentURL3.equals(cdNode1Val3.getContentUrl()));
-            assertFalse("Collision detected on node 2 after clear caches",contentURL1.equals(cdNode2Val3.getContentUrl()));
-            
-            assertEquals("ContentURL for node1 should be contentURL1",contentURL1,cdNode1Val3.getContentUrl());
-            assertEquals("ContentURL for node2 should be contentURL2",contentURL2,cdNode2Val3.getContentUrl());
-        }
-        finally
-        {
-            contentPropertyRestrictionInterceptor.setGlobalContentPropertyRestrictionWhiteList("");
-        }
-        
-    }
 
     private void addContentToNode(NodeRef nodeRef)
     {

repository/src/test/java/org/alfresco/repo/rendition2/TestTransformServiceRegistry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -25,7 +25,6 @@
  */
 package org.alfresco.repo.rendition2;
 
-import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.transform.client.registry.TransformServiceRegistry;
 
 import java.util.Map;
@@ -70,10 +69,4 @@ public class TestTransformServiceRegistry implements TransformServiceRegistry
     {
         throw new UnsupportedOperationException("not implemented");
     }
-
-    @Override
-    public boolean isSupported(CoreFunction function, String transformerName)
-    {
-        return true;
-    }
 }

repository/src/test/java/org/alfresco/repo/security/SecurityTestSuite.java

@@ -99,7 +99,7 @@ public class SecurityTestSuite extends TestSuite
 
         suite.addTest(new JUnit4TestAdapter(HomeFolderProviderSynchronizerTest.class));
         suite.addTest(new JUnit4TestAdapter(AlfrescoSSLSocketFactoryTest.class));
-		suite.addTest(new JUnit4TestAdapter(FixedAclUpdaterTest.class));
+		suite.addTestSuite(FixedAclUpdaterTest.class);
 
 		suite.addTestSuite(DefaultRemoteUserMapperTest.class);
 		suite.addTestSuite(IdentityServiceRemoteUserMapperTest.class);

repository/src/test/java/org/alfresco/util/test/OmittedTestClassFinderUnitTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -29,16 +29,10 @@ import static java.util.Collections.emptySet;
 import static java.util.stream.Collectors.toSet;
 
 import static junit.framework.TestCase.assertEquals;
-import static org.reflections.scanners.Scanners.MethodsAnnotated;
-import static org.reflections.scanners.Scanners.SubTypes;
-import static org.reflections.scanners.Scanners.TypesAnnotated;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -55,7 +49,6 @@ import org.junit.experimental.categories.Category;
 import org.junit.runners.Suite.SuiteClasses;
 import org.reflections.Reflections;
 import org.reflections.scanners.MethodAnnotationsScanner;
-import org.reflections.scanners.Scanners;
 import org.reflections.scanners.SubTypesScanner;
 import org.reflections.scanners.TypeAnnotationsScanner;
 
@@ -76,7 +69,7 @@ public class OmittedTestClassFinderUnitTest
     public void checkTestClassesReferencedInTestSuites()
     {
         // We assume that all of our tests are in org.alfresco.
-        Reflections reflections = new Reflections("org.alfresco", MethodsAnnotated, TypesAnnotated, SubTypes);
+        Reflections reflections = new Reflections("org.alfresco", new MethodAnnotationsScanner(), new TypeAnnotationsScanner(), new SubTypesScanner());
 
         // Find the test classes which are not in test suites.
         Set<String> testClasses =  getTestClassesOnPath(reflections);
@@ -169,14 +162,13 @@ public class OmittedTestClassFinderUnitTest
      * @param annotation The class of the annotation to look for.
      * @return The set of canonical names of classes containing methods annotated with the annotation.
      */
-    private Set<String> findClassesWithMethodAnnotation(Reflections reflections, Class<? extends Annotation> annotation)
+    private Set<String> findClassesWithMethodAnnotation(Reflections reflections, Class annotation)
     {
-        return reflections.getMethodsAnnotatedWith(annotation)
+        return reflections.getStore()
+                          .get(MethodAnnotationsScanner.class, annotation.getName())
                           .stream()
-                          .map(Method::getDeclaringClass)
-                          .flatMap(c -> Stream.concat(Stream.of(c), reflections.getSubTypesOf(c).stream()))
-                          .map(Class::getCanonicalName)
-                          .filter(Objects::nonNull)
+                          // Get the class name from the method name.
+                          .map(methodName -> methodName.split("\\.[^\\.]+\\(")[0])
                           .collect(toSet());
     }
 

repository/src/test/java/org/alfresco/util/test/junitrules/RetryAtMostRule.java

@@ -1,132 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.util.test.junitrules;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-/**
- * This JUnit rule can be used to turn existing test code into retryable tests.
- * The test methods marked with the {@link RetryAtMost} annotation will be attempted at most the specified
- * amount of times, stopping at the first successful execution.
- *
- * @author Domenico Sibilio
- */
-public class RetryAtMostRule implements TestRule
-{
-    private static final Log LOG = LogFactory.getLog(RetryAtMostRule.class);
-
-    @Override
-    public Statement apply(final Statement statement, final Description description)
-    {
-        RetryAtMost retryAtMost = description.getAnnotation(RetryAtMost.class);
-
-        if (retryAtMost != null)
-        {
-            return new RetryAtMostTestStatement(statement, description, retryAtMost.value());
-        }
-
-        return statement;
-    }
-
-    private static class RetryAtMostTestStatement extends Statement
-    {
-        private final Statement statement;
-        private final Description description;
-        private final int retryCount;
-
-        private RetryAtMostTestStatement(Statement statement, Description description, int retryCount)
-        {
-            this.statement = statement;
-            this.description = description;
-            this.retryCount = retryCount;
-        }
-
-        @Override
-        public void evaluate() throws Throwable
-        {
-            validate();
-            for (int i = 0; i < retryCount; i++)
-            {
-                try
-                {
-                    LOG.debug(
-                        "Retryable testing configured for method: " + description.getMethodName()
-                            + " // Attempt #" + (i + 1));
-                    statement.evaluate();
-                    break; // stop at the first successful execution
-                }
-                catch (Throwable t)
-                {
-                    // ignore failed test runs unless it's the last possible execution
-                    if (isLastExecution(i))
-                    {
-                        throw t;
-                    }
-                }
-            }
-        }
-
-        private void validate()
-        {
-            if (retryCount < 1)
-            {
-                String methodName = description.getMethodName();
-                throw new IllegalArgumentException(
-                    "Invalid value for @RetryAtMost on method " + methodName + ": " + retryCount + " is less than 1.");
-            }
-        }
-
-        private boolean isLastExecution(int i)
-        {
-            return i == retryCount - 1;
-        }
-    }
-
-    /**
-     * This annotation is a marker used to identify a JUnit &#64;{@link Test} method as a retryable test.
-     */
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.RUNTIME)
-    @Documented
-    public @interface RetryAtMost
-    {
-        /**
-         * @return The amount of times a test will be attempted, at most.
-         */
-        int value() default 1;
-    }
-}

repository/src/test/java/org/alfresco/util/test/junitrules/RetryAtMostRuleTest.java

@@ -1,138 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.util.test.junitrules;
-
-import static org.junit.Assert.assertSame;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-
-import java.lang.annotation.Annotation;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.alfresco.util.test.junitrules.RetryAtMostRule.RetryAtMost;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-import org.junit.runner.Description;
-import org.junit.runner.RunWith;
-import org.junit.runners.model.Statement;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-/**
- * Test class for {@link RetryAtMostRule}.
- *
- * @author Domenico Sibilio
- */
-@RunWith(MockitoJUnitRunner.class)
-public class RetryAtMostRuleTest
-{
-
-    private static final String ANNOTATION_WITH_NEGATIVE_VALUE = "annotationRetryAtMostNegativeTimes";
-    private static final String ANNOTATION_RETRY_AT_MOST_THRICE = "annotationRetryAtMostThrice";
-    private static final AtomicInteger EXECUTION_COUNT = new AtomicInteger(0);
-    @Rule
-    public RetryAtMostRule retryAtMostRule = new RetryAtMostRule();
-    @Rule
-    public TestName testNameRule = new TestName();
-    @Mock
-    private Statement statementMock;
-
-    @Test
-    public void testSucceedOnFirstAttempt() throws Throwable
-    {
-        Description description = Description.createTestDescription(RetryAtMostRuleTest.class.getSimpleName(),
-            testNameRule.getMethodName(), getAnnotationByMethodName(ANNOTATION_RETRY_AT_MOST_THRICE));
-
-        Statement statement = retryAtMostRule.apply(statementMock, description);
-        statement.evaluate();
-        verify(statementMock, times(1)).evaluate();
-    }
-
-    @Test
-    public void testSucceedOnSecondAttempt() throws Throwable
-    {
-        doThrow(new AssertionError("First execution should fail")).doNothing().when(statementMock).evaluate();
-
-        Description description = Description.createTestDescription(RetryAtMostRuleTest.class.getSimpleName(),
-            testNameRule.getMethodName(), getAnnotationByMethodName(ANNOTATION_RETRY_AT_MOST_THRICE));
-
-        Statement statement = retryAtMostRule.apply(statementMock, description);
-        statement.evaluate();
-        verify(statementMock, times(2)).evaluate();
-    }
-
-    @Test
-    @RetryAtMost(3)
-    public void testSucceedOnThirdAttempt()
-    {
-        int currentExecution = EXECUTION_COUNT.incrementAndGet();
-        assertSame("This test should be executed 3 times", 3, currentExecution);
-    }
-
-    @Test(expected = AssertionError.class)
-    public void testFailAfterMaxAttempts() throws Throwable
-    {
-        doThrow(new AssertionError("All executions should fail")).when(statementMock).evaluate();
-
-        Description description = Description.createTestDescription(RetryAtMostRuleTest.class.getSimpleName(),
-            testNameRule.getMethodName(), getAnnotationByMethodName(ANNOTATION_RETRY_AT_MOST_THRICE));
-
-        Statement statement = retryAtMostRule.apply(statementMock, description);
-        statement.evaluate();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testInvalidRetryAtMostTimes() throws Throwable
-    {
-        Description description = Description.createTestDescription(RetryAtMostRuleTest.class.getSimpleName(),
-            testNameRule.getMethodName(), getAnnotationByMethodName(ANNOTATION_WITH_NEGATIVE_VALUE));
-
-        Statement statement = retryAtMostRule.apply(statementMock, description);
-        statement.evaluate();
-        verifyNoInteractions(statementMock);
-    }
-
-    private Annotation getAnnotationByMethodName(String methodName) throws NoSuchMethodException
-    {
-        return this.getClass().getMethod(methodName).getAnnotation(RetryAtMost.class);
-    }
-
-    @RetryAtMost(-1)
-    public void annotationRetryAtMostNegativeTimes()
-    {
-        // intentionally empty
-    }
-
-    @RetryAtMost(3)
-    public void annotationRetryAtMostThrice()
-    {
-        // intentionally empty
-    }
-
-}