[RM-7187] - Added REST endpoints for implementation for events API

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>20.50-SNAPSHOT</version>
+      <version>20.36-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>20.50-SNAPSHOT</version>
+      <version>20.36-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>20.50-SNAPSHOT</version>
+      <version>20.36-SNAPSHOT</version>
    </parent>
 
    <build>
@@ -42,6 +42,18 @@
    </build>
 
    <dependencies>
+      <dependency>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j2-impl</artifactId>
+         <version>${dependency.log4j.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-core</artifactId>
+         <version>${dependency.log4j.version}</version>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi</artifactId>
@@ -57,6 +69,17 @@
          <groupId>org.alfresco.tas</groupId>
          <artifactId>utility</artifactId>
          <version>${dependency.tas-utility.version}</version>
+         <!-- These exclusions can be removed once tas-utility does not rely on Reload4j anymore -->
+         <exclusions>
+            <exclusion>
+               <groupId>ch.qos.reload4j</groupId>
+               <artifactId>reload4j</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>org.slf4j</groupId>
+               <artifactId>slf4j-reload4j</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.projectlombok</groupId>

amps/ags/rm-community/pom.xml

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

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

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.6
+SOLR6_TAG=2.0.6-A4
 POSTGRES_TAG=14.4
 ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-rest-context.xml

@@ -175,6 +175,14 @@
        <property name="nodesModelFactory" ref="nodesModelFactory" />
     </bean>
 
+    <bean class="org.alfresco.rm.rest.api.events.EventEntityResource">
+        <property name="recordsManagementEventService" ref="RecordsManagementEventService" />
+    </bean>
+
+    <bean class="org.alfresco.rm.rest.api.events.EventTypeEntityResource">
+        <property name="recordsManagementEventService" ref="RecordsManagementEventService" />
+    </bean>
+
    <!-- extended sites bean definition -->
    <bean id="rm.sites" class="org.alfresco.rm.rest.api.impl.RMSitesImpl" parent="sites">
         <property name="siteSurfConfig" ref="rm.siteSurfConfig" />
@@ -209,6 +217,8 @@
                 <entry key="org.alfresco.service.cmr.attributes.DuplicateAttributeException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
                 <entry key="org.alfresco.module.org_alfresco_module_rm.record.RecordCreationException" value="422" />
                 <entry key="org.alfresco.service.cmr.model.FileExistsException" value="409" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.EventAlreadyExistsException" value="409" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.EntityNotFoundException" value="404" />
             </map>
         </property>
    </bean>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties

@@ -47,7 +47,6 @@ rm.methodsecurity.org.alfresco.service.cmr.repository.NodeService.getPaths=RM.Re
 rm.methodsecurity.org.alfresco.service.cmr.repository.NodeService.getStoreArchiveNode=RM_ABSTAIN
 rm.methodsecurity.org.alfresco.service.cmr.repository.NodeService.restoreNode=RM_ABSTAIN
 rm.methodsecurity.org.alfresco.service.cmr.repository.NodeService.getChildAssocsWithoutParentAssocsOfType=RM_ABSTAIN
-rm.methodsecurity.org.alfresco.service.cmr.repository.NodeService.findAssocsNotLinkedByTwoOtherAssocs=RM_ABSTAIN
 rm.methodsecurity.org.alfresco.service.cmr.repository.NodeService.getNodeRef=RM.Read.0
 rm.methodsecurity.org.alfresco.service.cmr.repository.NodeService.getChildAssocsByPropertyValue=RM.Read.0,AFTER_RM.FilterNode
 rm.methodsecurity.org.alfresco.service.cmr.repository.NodeService.countChildAssocs=RM.Read.0

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>20.50-SNAPSHOT</version>
+      <version>20.36-SNAPSHOT</version>
    </parent>
 
    <properties>

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/events/EventEntityResource.java

@@ -0,0 +1,222 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * 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.rm.rest.api.events;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEvent;
+import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
+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.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.EventAlreadyExistsException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rm.rest.api.model.EventBody;
+import org.alfresco.rm.rest.api.model.EventInfo;
+import org.alfresco.util.GUID;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.alfresco.util.ParameterCheck.mandatory;
+
+/**
+ * Event entity resource
+ */
+@EntityResource(name = "events", title = "Events")
+public class EventEntityResource implements EntityResourceAction.Read<EventInfo>,
+                                            EntityResourceAction.ReadById<EventInfo>,
+                                            EntityResourceAction.Update<EventBody>,
+                                            EntityResourceAction.Create<EventBody> {
+
+    private RecordsManagementEventService recordsManagementEventService;
+
+    /**
+     * Set the records management event service
+     *
+     * @param rmEventService
+     */
+    public void setRecordsManagementEventService(RecordsManagementEventService rmEventService)
+    {
+        this.recordsManagementEventService = rmEventService;
+    }
+
+    @Override
+    @WebApiDescription(title = "Return a single event identified by 'eventId'")
+    @WebApiParam(name = "eventId", title = "The event id", kind = ResourceParameter.KIND.URL_PATH)
+    public EventInfo readById(String eventId, Parameters parameters) throws EntityNotFoundException
+    {
+        mandatory("eventId", eventId);
+
+        RecordsManagementEvent event = null;
+        if (eventExists(eventId))
+        {
+            // Get the event
+            event = recordsManagementEventService.getEvent(eventId);
+        }
+
+        return EventInfo.fromRecordsManagementEvent(event);
+    }
+
+    @Override
+    @WebApiDescription(title = "Return a list of events")
+    public CollectionWithPagingInfo<EventInfo> readAll(Parameters params)
+    {
+        Paging paging = params.getPaging();
+
+        List<EventInfo> eventInfoList = recordsManagementEventService.getEvents().stream()
+                .map(EventInfo::fromRecordsManagementEvent)
+                .collect(Collectors.toList());
+
+        int totalCount = eventInfoList.size();
+        boolean hasMoreItems = paging.getSkipCount() + paging.getMaxItems() < totalCount;
+        return CollectionWithPagingInfo.asPaged(paging, eventInfoList.stream()
+                .skip(paging.getSkipCount())
+                .limit(paging.getMaxItems())
+                .collect(Collectors.toList()), hasMoreItems, totalCount);
+    }
+
+    @Override
+    @WebApiDescription(title = "Create a new event")
+    public List<EventBody> create(List<EventBody> eventBodyList, Parameters parameters)
+    {
+        //TODO: 403 User not allowed to update event error still needs to be implemented
+        mandatory("eventBodyList", eventBodyList);
+        for (EventBody eventBody : eventBodyList) {
+            mandatory("eventName", eventBody.getName());
+            mandatory("eventType", eventBody.getType());
+        }
+
+        List<EventBody> responseEventBodyList = new ArrayList<>();
+        for (EventBody eventBody : eventBodyList) {
+            String eventId = GUID.generate();
+            String eventName = eventBody.getName();
+            String eventType = eventBody.getType();
+
+            if(canCreateEvent(eventId, eventName)) {
+                RecordsManagementEvent event = recordsManagementEventService.addEvent(eventType, eventId, eventName);
+                responseEventBodyList.add(EventBody.fromRecordsManagementEvent(event));
+            }
+        }
+        return responseEventBodyList;
+    }
+
+    @Override
+    @WebApiDescription(title = "Update a single event identified by 'eventId'")
+    @WebApiParam(name = "eventId", title = "The event id", kind = ResourceParameter.KIND.URL_PATH)
+    public EventBody update(String eventId, EventBody eventBody, Parameters parameters)
+    {
+        //TODO: 403 User not allowed to update event error still needs to be implemented
+        mandatory("eventId", eventId);
+        mandatory("eventName", eventBody.getName());
+        mandatory("eventType", eventBody.getType());
+
+        RecordsManagementEvent event = null;
+        if (canEditEvent(eventBody.getName(), eventId, eventBody.getType()))
+        {
+            // Create event
+            event = recordsManagementEventService.addEvent(eventBody.getType(), eventId, eventBody.getName());
+        }
+        else
+        {
+            // Get event
+            event = recordsManagementEventService.getEvent(eventId);
+        }
+
+        return EventBody.fromRecordsManagementEvent(event);
+    }
+
+    /**
+     * Helper method for checking if an event exists or not. Throws an
+     * error if the event does not exist.
+     *
+     * @param eventId The id of the event
+     */
+    private boolean eventExists(String eventId)
+    {
+        boolean eventExists = true;
+
+        // Check the event exists
+        if (!recordsManagementEventService.existsEvent(eventId))
+        {
+            throw new EntityNotFoundException(eventId);
+        }
+
+        return eventExists;
+    }
+
+    /**
+     * Helper method for checking if an event can be created or not. Throws an
+     * error if the event already exists.
+     *
+     * @param eventId The id of the event
+     * @param eventName The name of the event
+     */
+    private boolean canCreateEvent(String eventId, String eventName)
+    {
+        boolean canCreateEvent = true;
+
+        if (!recordsManagementEventService.canCreateEvent(eventName, eventId))
+        {
+            throw new EventAlreadyExistsException("framework.exception.CreateEventAlreadyExists", new Object[] {eventName});
+        }
+
+        return canCreateEvent;
+    }
+
+    /**
+     * Helper method for checking if an event can be edited or not. Throws an
+     * error if an event with the same display label already exists.
+     *
+     * @param eventName The name of the event
+     * @param eventId The id of the event
+     * @param eventType The type of the event
+     * @return true if the event can be edited, false otherwise
+     */
+    private boolean canEditEvent(String eventName, String eventId, String eventType)
+    {
+        boolean canEditEvent = false;
+        if (eventExists(eventId)) {
+            try
+            {
+                canEditEvent = recordsManagementEventService.canEditEvent(eventName, eventId, eventType);
+            }
+            catch (AlfrescoRuntimeException are)
+            {
+                throw new EventAlreadyExistsException("framework.exception.UpdateEventAlreadyExists", new Object[] {eventName});
+            }
+        }
+        return canEditEvent;
+    }
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/events/EventTypeEntityResource.java

@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * 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.rm.rest.api.events;
+
+import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rm.rest.api.model.EventTypeInfo;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Event Type entity resource
+ */
+@EntityResource(name = "event-types", title = "Event Types")
+public class EventTypeEntityResource implements EntityResourceAction.Read<EventTypeInfo> {
+    private RecordsManagementEventService recordsManagementEventService;
+
+    /**
+     * Set the records management event service
+     * @param rmEventService
+     */
+    public void setRecordsManagementEventService(RecordsManagementEventService rmEventService)
+    {
+        this.recordsManagementEventService = rmEventService;
+    }
+
+    @Override
+    @WebApiDescription(title = "Return a list of different event types")
+    public CollectionWithPagingInfo<EventTypeInfo> readAll(Parameters params)
+    {
+        // TODO: AssociationName and ActionOnAssociatedNode properties still need to be assigned.
+        Paging paging = params.getPaging();
+
+        List<EventTypeInfo> eventTypeInfoList = recordsManagementEventService.getEventTypes().stream()
+                .map(EventTypeInfo::fromRecordsManagementEventType)
+                .collect(Collectors.toList());
+
+        int totalCount = eventTypeInfoList.size();
+        boolean hasMoreItems = paging.getSkipCount() + paging.getMaxItems() < totalCount;
+        return CollectionWithPagingInfo.asPaged(paging, eventTypeInfoList.stream()
+                .skip(paging.getSkipCount())
+                .limit(paging.getMaxItems())
+                .collect(Collectors.toList()), hasMoreItems, totalCount);
+    }
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/events/package-info.java

@@ -1,35 +1,34 @@
 /*
  * #%L
- * Alfresco Remote API
+ * Alfresco Records Management Module
  * %%
- * 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.
- *
+ * 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.rest.model;
-
-import org.alfresco.rest.core.RestModels;
-
-public class RestCategoryModelsCollection extends RestModels<RestCategoryModel, RestCandidateModelsCollection>
-{
-
-}
- 
+/**
+ * Package info that defines the Information Governance Events REST API
+ */
+@WebApi(name="gs", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rm.rest.api.events;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/EventBody.java

@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * 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.rm.rest.api.model;
+
+
+import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEvent;
+
+/**
+ * The EventBody model to be exposed through REST API.
+ */
+public class EventBody {
+    private String name;
+    private String type;
+
+    public static EventBody fromRecordsManagementEvent(RecordsManagementEvent event)
+    {
+        EventBody eventBody = new EventBody();
+        if(event != null) {
+            eventBody.setName(event.getDisplayLabel());
+            eventBody.setType(event.getType());
+        }
+        return eventBody;
+    }
+
+    public EventBody() {}
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/EventInfo.java

@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * 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.rm.rest.api.model;
+
+import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEvent;
+
+/**
+ * The EventInfo model to be exposed through REST API.
+ */
+public class EventInfo {
+    private String id;
+    private String name;
+    private String type;
+
+    public static EventInfo fromRecordsManagementEvent(RecordsManagementEvent event)
+    {
+        EventInfo eventInfo = new EventInfo();
+        if (event != null) {
+            eventInfo.setName(event.getDisplayLabel());
+            eventInfo.setId(event.getName());
+            eventInfo.setType(event.getType());
+        }
+        return eventInfo;
+    }
+
+    public EventInfo() {}
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+}

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/EventTypeInfo.java

@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * 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.rm.rest.api.model;
+
+import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventType;
+
+/**
+ * The EventTypeInfo model to be exposed through REST API.
+ */
+public class EventTypeInfo {
+    private String id;
+    private String name;
+    private boolean isAutomatic;
+    private String associationName;
+    private String actionOnAssociatedNode;
+
+    public static EventTypeInfo fromRecordsManagementEventType(RecordsManagementEventType eventType)
+    {
+        EventTypeInfo eventTypeInfo = new EventTypeInfo();
+        if (eventType != null) {
+            eventTypeInfo.setName(eventType.getDisplayLabel());
+            eventTypeInfo.setId(eventType.getName());
+            eventTypeInfo.setAutomatic(eventType.isAutomaticEvent());
+        }
+        return eventTypeInfo;
+    }
+
+    public EventTypeInfo() {}
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public boolean isAutomatic()
+    {
+        return isAutomatic;
+    }
+
+    public void setAutomatic(boolean automatic)
+    {
+        isAutomatic = automatic;
+    }
+
+    public String getAssociationName()
+    {
+        return associationName;
+    }
+
+    public void setAssociationName(String associationName)
+    {
+        this.associationName = associationName;
+    }
+
+    public String getActionOnAssociatedNode()
+    {
+        return actionOnAssociatedNode;
+    }
+
+    public void setActionOnAssociatedNode(String actionOnAssociatedNode)
+    {
+        this.actionOnAssociatedNode = actionOnAssociatedNode;
+    }
+}
+

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>20.50-SNAPSHOT</version>
+        <version>20.36-SNAPSHOT</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.50-SNAPSHOT</version>
+        <version>20.36-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>20.50-SNAPSHOT</version>
+        <version>20.36-SNAPSHOT</version>
     </parent>
 
     <properties>

core/pom.xml

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

data-model/pom.xml

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

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Data model classes
  * %%
- * 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 
@@ -714,18 +714,6 @@ public interface NodeService
             final NodeRef parent,
             final QName assocTypeQName);
 
-    /**
-     * Gets the list of the localnames of the child associations without parent node
-     *
-     * @param parent
-     *            the parent node reference
-     * @return a list of the local names of the child associations
-     */
-    @Auditable(parameters = {"parent"})
-    public List<String> findAssocsNotLinkedByTwoOtherAssocs(
-            final NodeRef parent);
-
-
     /**
      * Create a peer association between two nodes.
      * <p/>

mmt/pom.xml

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

packaging/distribution/pom.xml

@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.50-SNAPSHOT</version>
+        <version>20.36-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>20.50-SNAPSHOT</version>
+        <version>20.36-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/pom.xml

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

packaging/tests/environment/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.6
+SOLR6_TAG=2.0.6-A4
 POSTGRES_TAG=14.4
 ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8

packaging/tests/pom.xml

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

packaging/tests/scripts/output_tests_run.sh

@@ -4,4 +4,4 @@ TAS_DIRECTORY=$1
 
 cd ${TAS_DIRECTORY}
 
-cat target/reports/alfresco-tas.log | grep -a "*** STARTING"
+cat target/reports/alfresco-tas.log | grep "*** STARTING"

packaging/tests/tas-cmis/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.50-SNAPSHOT</version>
+        <version>20.36-SNAPSHOT</version>
     </parent>
 
     <organization>

packaging/tests/tas-cmis/src/main/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

packaging/tests/tas-cmis/src/main/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

packaging/tests/tas-cmis/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

packaging/tests/tas-cmis/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

packaging/tests/tas-email/pom.xml

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

packaging/tests/tas-email/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

packaging/tests/tas-email/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

packaging/tests/tas-integration/pom.xml

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

packaging/tests/tas-integration/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

packaging/tests/tas-integration/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

packaging/tests/tas-restapi/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.50-SNAPSHOT</version>
+        <version>20.36-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCategoryModel.java

@@ -1,7 +1,5 @@
 package org.alfresco.rest.model;
 
-import java.util.Objects;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.alfresco.rest.core.IRestModel;
 import org.alfresco.utility.model.TestModel;
@@ -49,7 +47,8 @@ This must be unique within the parent category.
     private boolean hasChildren;	    
     /**
     The number of nodes that are assigned to this category.
-    */
+    */	        
+
     private long count;
 
     public String getId()
@@ -100,80 +99,6 @@ This must be unique within the parent category.
     public void setCount(long count)
     {
         this.count = count;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        RestCategoryModel that = (RestCategoryModel) o;
-        return Objects.equals(id, that.id);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(id);
-    }
-
-    @Override
-    public String toString()
-    {
-        return "RestCategoryModel{" +
-                "id='" + id + '\'' +
-                ", name='" + name + '\'' +
-                ", parentId='" + parentId + '\'' +
-                ", hasChildren=" + hasChildren +
-                ", count=" + count +
-                '}';
-    }
-
-    public static Builder builder()
-    {
-        return new Builder();
-    }
-
-    public static class Builder
-    {
-        private String id;
-        private String name;
-        private String parentId;
-        private boolean hasChildren;
-
-        public Builder id(String id)
-        {
-            this.id = id;
-            return this;
-        }
-
-        public Builder name(String name)
-        {
-            this.name = name;
-            return this;
-        }
-
-        public Builder parentId(String parentId)
-        {
-            this.parentId = parentId;
-            return this;
-        }
-
-        public Builder hasChildren(boolean hasChildren)
-        {
-            this.hasChildren = hasChildren;
-            return this;
-        }
-
-        public RestCategoryModel create()
-        {
-            final RestCategoryModel category = new RestCategoryModel();
-            category.setId(id);
-            category.setName(name);
-            category.setParentId(parentId);
-            category.setHasChildren(hasChildren);
-            return category;
-        }
-    }
+    }				
 }
  

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Categories.java

@@ -25,14 +25,9 @@
  */
 package org.alfresco.rest.requests;
 
-import static org.alfresco.rest.core.JsonBodyGenerator.arrayToJson;
-
-import java.util.List;
-
 import org.alfresco.rest.core.RestRequest;
 import org.alfresco.rest.core.RestWrapper;
 import org.alfresco.rest.model.RestCategoryModel;
-import org.alfresco.rest.model.RestCategoryModelsCollection;
 import org.springframework.http.HttpMethod;
 
 public class Categories extends ModelRequest<Categories>
@@ -46,9 +41,9 @@ public class Categories extends ModelRequest<Categories>
     }
 
     /**
-     * Retrieves a category with ID using GET call on "/categories/{categoryId}"
+     * Retrieves a category with ID using GET call on using GET call on "/tags/{tagId}"
      *
-     * @return RestCategoryModel
+     * @return
      */
     public RestCategoryModel getCategory()
     {
@@ -57,62 +52,4 @@ public class Categories extends ModelRequest<Categories>
         return restWrapper.processModel(RestCategoryModel.class, request);
     }
 
-    /**
-     * Create several categories in one request.
-     *
-     * @param restCategoryModels The list of categories to create.
-     * @return The list of created categories with additional data populated by the repository.
-     */
-    public RestCategoryModelsCollection createCategoriesList(List<RestCategoryModel> restCategoryModels) {
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, arrayToJson(restCategoryModels), "categories/{categoryId}/subcategories", category.getId());
-        return restWrapper.processModels(RestCategoryModelsCollection.class, request);
-    }
-
-    /**
-     * Create single category.
-     *
-     * @param restCategoryModel The category to create.
-     * @return Created category with additional data populated by the repository.
-     */
-    public RestCategoryModel createSingleCategory(RestCategoryModel restCategoryModel)
-    {
-        RestRequest request = RestRequest
-                .requestWithBody(HttpMethod.POST, restCategoryModel.toJson(), "categories/{categoryId}/subcategories", category.getId());
-        return restWrapper.processModel(RestCategoryModel.class, request);
-    }
-
-    /**
-     * Get parent category children.
-     *
-     * @return The list of child categories.
-     */
-    public RestCategoryModelsCollection getCategoryChildren()
-    {
-        RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "categories/{categoryId}/subcategories", category.getId());
-        return restWrapper.processModels(RestCategoryModelsCollection.class, request);
-    }
-
-    /**
-     * Update single category.
-     * - PUT /categories/{categoryId}
-     *
-     * @param restCategoryModel The categories to update.
-     * @return Created category with additional data populated by the repository.
-     */
-    public RestCategoryModel updateCategory(RestCategoryModel restCategoryModel)
-    {
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, restCategoryModel.toJson(), "categories/{categoryId}", category.getId());
-        return restWrapper.processModel(RestCategoryModel.class, request);
-    }
-    /**
-     * Delete category.
-     * - DELETE /categories/{categoryId}
-     */
-    public void deleteCategory()
-    {
-        RestRequest request = RestRequest.
-                simpleRequest(HttpMethod.DELETE, "/categories/{categoryId}", category.getId());
-        restWrapper.processEmptyModel(request);
-    }
-
 }

packaging/tests/tas-restapi/src/main/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

packaging/tests/tas-restapi/src/main/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/CategoriesRestTest.java

@@ -1,91 +0,0 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * 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.rest.categories;
-
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.CREATED;
-
-import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestCategoryModel;
-import org.alfresco.utility.model.UserModel;
-import org.testng.annotations.BeforeClass;
-
-abstract class CategoriesRestTest extends RestTest
-{
-    protected static final String ROOT_CATEGORY_ID = "-root-";
-    protected static final String CATEGORY_NAME_PREFIX = "CategoryName";
-    protected static final String FIELD_NAME = "name";
-    protected static final String FIELD_ID = "id";
-    protected static final String FIELD_PARENT_ID = "parentId";
-    protected static final String FIELD_HAS_CHILDREN = "hasChildren";
-
-    protected UserModel user;
-
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation() throws Exception
-    {
-        STEP("Create a user");
-        user = dataUser.createRandomTestUser();
-    }
-
-    protected RestCategoryModel prepareCategoryUnderRoot()
-    {
-        return prepareCategoryUnder(ROOT_CATEGORY_ID);
-    }
-
-    protected RestCategoryModel prepareCategoryUnder(final String parentId)
-    {
-        final RestCategoryModel parentCategory = createCategoryModelWithId(parentId);
-        final RestCategoryModel categoryModel = createCategoryModelWithName(getRandomName(CATEGORY_NAME_PREFIX));
-        final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser())
-            .withCoreAPI()
-            .usingCategory(parentCategory)
-            .createSingleCategory(categoryModel);
-        restClient.assertStatusCodeIs(CREATED);
-
-        return createdCategory;
-    }
-
-    protected RestCategoryModel createCategoryModelWithId(final String id)
-    {
-        return createCategoryModelWithIdAndName(id, null);
-    }
-
-    protected RestCategoryModel createCategoryModelWithName(final String name)
-    {
-        return createCategoryModelWithIdAndName(null, name);
-    }
-
-    protected RestCategoryModel createCategoryModelWithIdAndName(final String id, final String name)
-    {
-        return RestCategoryModel.builder()
-            .id(id)
-            .name(name)
-            .create();
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/CreateCategoriesTests.java

@@ -1,240 +0,0 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * 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.rest.categories;
-
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.alfresco.rest.model.RestCategoryModel;
-import org.alfresco.rest.model.RestCategoryModelsCollection;
-import org.alfresco.utility.data.RandomData;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.TestGroup;
-import org.apache.commons.lang3.StringUtils;
-import org.testng.annotations.Test;
-
-public class CreateCategoriesTests extends CategoriesRestTest
-{
-
-    /**
-     * Check we can create a category as direct child of root category
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testCreateCategoryUnderRoot()
-    {
-        STEP("Create a category under root category (as admin)");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
-        final RestCategoryModel aCategory = createCategoryModelWithName(RandomData.getRandomName("Category"));
-        final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(rootCategory)
-                .createSingleCategory(aCategory);
-        restClient.assertStatusCodeIs(CREATED);
-
-        createdCategory.assertThat().field(FIELD_NAME).is(aCategory.getName());
-        createdCategory.assertThat().field(FIELD_PARENT_ID).is(rootCategory.getId());
-        createdCategory.assertThat().field(FIELD_HAS_CHILDREN).is(false);
-    }
-
-    /**
-     * Check we get 400 error when attempting to create a category with empty name
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testCreateCategoryWithoutName_andFail()
-    {
-        STEP("Create a category under root category (as admin)");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
-        final RestCategoryModel aCategory = createCategoryModelWithName(StringUtils.EMPTY);
-        restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(rootCategory)
-                .createSingleCategory(aCategory);
-        restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Category name must not be null or empty");
-    }
-
-    /**
-     * Check we can create several categories as children of a created category
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testCreateSeveralSubCategories()
-    {
-        STEP("Create a category under root category (as admin)");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
-        final RestCategoryModel aCategory = createCategoryModelWithName(RandomData.getRandomName("Category"));
-        final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(rootCategory)
-                .createSingleCategory(aCategory);
-        restClient.assertStatusCodeIs(CREATED);
-
-        createdCategory.assertThat().field(FIELD_NAME).is(aCategory.getName())
-                .assertThat().field(FIELD_PARENT_ID).is(rootCategory.getId())
-                .assertThat().field(FIELD_HAS_CHILDREN).is(false)
-                .assertThat().field(FIELD_ID).isNotEmpty();
-
-        STEP("Create two categories under the previously created (as admin)");
-        final int categoriesNumber = 2;
-        final List<RestCategoryModel> categoriesToCreate = getCategoriesToCreate(categoriesNumber);
-        final RestCategoryModelsCollection createdSubCategories = restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(createdCategory)
-                .createCategoriesList(categoriesToCreate);
-        restClient.assertStatusCodeIs(CREATED);
-
-        createdSubCategories.assertThat()
-                .entriesListCountIs(categoriesToCreate.size());
-        IntStream.range(0, categoriesNumber)
-                .forEach(i -> createdSubCategories.getEntries().get(i).onModel()
-                    .assertThat().field(FIELD_NAME).is(categoriesToCreate.get(i).getName())
-                    .assertThat().field(FIELD_PARENT_ID).is(createdCategory.getId())
-                    .assertThat().field(FIELD_HAS_CHILDREN).is(false)
-                    .assertThat().field(FIELD_ID).isNotEmpty()
-                );
-
-        STEP("Get the parent category and check if it now has children (as regular user)");
-        final RestCategoryModel parentCategoryFromGet = restClient.authenticateUser(user)
-                .withCoreAPI()
-                .usingCategory(createdCategory)
-                .getCategory();
-
-        parentCategoryFromGet.assertThat().field(FIELD_HAS_CHILDREN).is(true);
-    }
-
-    /**
-     * Check we can create over 100 categories as children of a created category and pagination information is proper.
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testCreateOver100SubCategories()
-    {
-        STEP("Create a category under root category (as admin)");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
-        final RestCategoryModel aCategory = createCategoryModelWithName(RandomData.getRandomName("Category"));
-        final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(rootCategory)
-                .createSingleCategory(aCategory);
-        restClient.assertStatusCodeIs(CREATED);
-
-        createdCategory.assertThat().field(FIELD_NAME).is(aCategory.getName())
-                .assertThat().field(FIELD_PARENT_ID).is(rootCategory.getId())
-                .assertThat().field(FIELD_HAS_CHILDREN).is(false)
-                .assertThat().field(FIELD_ID).isNotEmpty();
-
-        STEP("Create more than a hundred categories under the previously created (as admin)");
-        final int categoriesNumber = 120;
-        final List<RestCategoryModel> categoriesToCreate = getCategoriesToCreate(categoriesNumber);
-        final RestCategoryModelsCollection createdSubCategories = restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(createdCategory)
-                .createCategoriesList(categoriesToCreate);
-        restClient.assertStatusCodeIs(CREATED);
-
-        createdSubCategories.assertThat()
-                .entriesListCountIs(categoriesToCreate.size());
-        IntStream.range(0, categoriesNumber)
-                .forEach(i -> createdSubCategories.getEntries().get(i).onModel()
-                        .assertThat().field(FIELD_NAME).is(categoriesToCreate.get(i).getName())
-                        .assertThat().field(FIELD_PARENT_ID).is(createdCategory.getId())
-                        .assertThat().field(FIELD_HAS_CHILDREN).is(false)
-                        .assertThat().field(FIELD_ID).isNotEmpty()
-                );
-        createdSubCategories.getPagination().assertThat().field("count").is(categoriesNumber)
-            .assertThat().field("totalItems").is(categoriesNumber)
-            .assertThat().field("maxItems").is(categoriesNumber)
-            .assertThat().field("skipCount").is(0)
-            .assertThat().field("hasMoreItems").is(false);
-
-    }
-
-    /**
-     * Check we cannot create a category as direct child of root category as non-admin user
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testCreateCategoryUnderRootAsRegularUser_andFail()
-    {
-        STEP("Create a category under root category (as user)");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
-        final RestCategoryModel aCategory = createCategoryModelWithName(RandomData.getRandomName("Category"));
-        restClient.authenticateUser(user)
-                .withCoreAPI()
-                .usingCategory(rootCategory)
-                .createSingleCategory(aCategory);
-        restClient.assertStatusCodeIs(FORBIDDEN).assertLastError().containsSummary("Current user does not have permission to manage a category");
-    }
-
-    /**
-     * Check we cannot create a category under non existing parent node
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testCreateCategoryUnderNonExistingParent_andFail()
-    {
-        STEP("Create a category under non existing category node (as admin)");
-        final String id = "non-existing-node-id";
-        final RestCategoryModel rootCategory = createCategoryModelWithId(id);
-        final RestCategoryModel aCategory = createCategoryModelWithName(RandomData.getRandomName("Category"));
-        restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(rootCategory)
-                .createSingleCategory(aCategory);
-        restClient.assertStatusCodeIs(NOT_FOUND).assertLastError().containsSummary("The entity with id: " + id + " was not found");
-    }
-
-    /**
-     * Check we cannot create a category under a node which is not a category
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testCreateCategoryUnderFolderNode_andFail()
-    {
-        STEP("Create a site and a folder inside it");
-        final SiteModel site = dataSite.usingUser(user).createPublicRandomSite();
-        final FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
-
-        STEP("Create a category under folder node (as admin)");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(folder.getNodeRef());
-        final RestCategoryModel aCategory = createCategoryModelWithName(RandomData.getRandomName("Category"));
-        restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(rootCategory)
-                .createSingleCategory(aCategory);
-        restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category");
-    }
-
-    static List<RestCategoryModel> getCategoriesToCreate(final int count)
-    {
-        return IntStream.range(0, count)
-            .mapToObj(i -> RestCategoryModel.builder().name(RandomData.getRandomName("SubCategory")).create())
-            .collect(Collectors.toList());
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/DeleteCategoriesTests.java

@@ -1,102 +0,0 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * 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.rest.categories;
-
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.NO_CONTENT;
-
-import org.alfresco.rest.model.RestCategoryModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.TestGroup;
-import org.testng.annotations.Test;
-
-public class DeleteCategoriesTests extends CategoriesRestTest
-{
-
-    /**
-     * Check we can delete a category.
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testDeleteCategory()
-    {
-        STEP("Create a category and send a request to delete it.");
-        RestCategoryModel aCategory = prepareCategoryUnderRoot();
-        restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingCategory(aCategory).deleteCategory();
-        restClient.assertStatusCodeIs(NO_CONTENT);
-
-        STEP("Ensure that the category has been deleted by sending a GET request and receiving 404.");
-        restClient.authenticateUser(user).withCoreAPI().usingCategory(aCategory).getCategory();
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /**
-     * Check we get an error when trying to delete a category as a non-admin user.
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testDeleteCategoryAsRegularUser_andFail()
-    {
-        RestCategoryModel aCategory = prepareCategoryUnderRoot();
-        restClient.authenticateUser(user).withCoreAPI().usingCategory(aCategory).deleteCategory();
-        restClient.assertStatusCodeIs(FORBIDDEN).assertLastError().containsSummary("Current user does not have permission to manage a category");
-    }
-
-    /**
-     * Check we receive 404 error when trying to delete a category with a non-existent node id.
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testDeleteNonExistentCategory()
-    {
-        STEP("Get category with non-existent id");
-        final String id = "non-existing-dummy-id";
-        final RestCategoryModel rootCategory = createCategoryModelWithId(id);
-
-        STEP("Attempt to delete category with non-existent id and receive 404");
-        restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingCategory(rootCategory).deleteCategory();
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /**
-     * Attempt to delete a category when providing a node id that doesn't belong to a category
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testDeleteCategory_givenNonCategoryNodeId()
-    {
-        STEP("Create a site and a folder inside it");
-        final SiteModel site = dataSite.usingUser(user).createPublicRandomSite();
-        final FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
-        String id = folder.getNodeRef();
-
-        STEP("Create a category, set its id to the folder id and attempt to delete it");
-        final RestCategoryModel aCategory = createCategoryModelWithId(id);
-        restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingCategory(aCategory).deleteCategory();
-        restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category");
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/GetCategoriesTests.java

@@ -28,51 +28,26 @@ package org.alfresco.rest.categories;
 
 import static org.alfresco.utility.report.log.Step.STEP;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.CREATED;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.OK;
-import static org.testng.Assert.assertTrue;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
+import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestCategoryModel;
-import org.alfresco.rest.model.RestCategoryModelsCollection;
-import org.alfresco.utility.data.RandomData;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.TestGroup;
+import org.alfresco.utility.model.UserModel;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-public class GetCategoriesTests extends CategoriesRestTest
+public class GetCategoriesTests extends RestTest
 {
-    private static final List<String> DEFAULT_ROOT_CATEGORIES = List.of("Software Document Classification", "Languages", "Regions", "Tags");
-    private static final String NON_EXISTING_CATEGORY_ID = "non-existing-category-id";
+    private UserModel user;
 
-    /**
-     * Check we can get a category which we just created in as direct child of root category
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testGetCategoryById()
+    @BeforeClass(alwaysRun = true)
+    public void dataPreparation() throws Exception
     {
-        STEP("Create a category under root category (as admin)");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
-        final RestCategoryModel aCategory = createCategoryModelWithName(RandomData.getRandomName("Category"));
-        final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(rootCategory)
-                .createSingleCategory(aCategory);
-        restClient.assertStatusCodeIs(CREATED);
-
-        createdCategory.assertThat().field("name").is(aCategory.getName());
-        createdCategory.assertThat().field("parentId").is(rootCategory.getId());
-        createdCategory.assertThat().field("hasChildren").is(false);
-
-        STEP("Get the created category (as regular user)");
-        final RestCategoryModel categoryFromGet =
-                restClient.authenticateUser(user).withCoreAPI().usingCategory(createdCategory).getCategory();
-        restClient.assertStatusCodeIs(OK);
-        categoryFromGet.assertThat().isEqualTo(createdCategory);
+        STEP("Create a user");
+        user = dataUser.createRandomTestUser();
     }
 
     /**
@@ -81,14 +56,15 @@ public class GetCategoriesTests extends CategoriesRestTest
     @Test(groups = {TestGroup.REST_API})
     public void testGetCategoryByIdProvidingRootAsId()
     {
-        STEP("Get category with -root- as id");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
+        STEP("Get category with -root- as id (which does not exist)");
+        final RestCategoryModel rootCategory = new RestCategoryModel();
+        rootCategory.setId("-root-");
         restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategory();
-        restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category");
+        restClient.assertStatusCodeIs(NOT_FOUND);
     }
 
     /**
-     * Check we get an error when passing folder node id as category id
+     * Check we get an error when passing  as category id
      */
     @Test(groups = {TestGroup.REST_API})
     public void testGetCategoryByIdProvidingFolderAsId()
@@ -98,98 +74,10 @@ public class GetCategoriesTests extends CategoriesRestTest
         final FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
 
         STEP("Get category with folder id passed as id");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(folder.getNodeRef());
+        final RestCategoryModel rootCategory = new RestCategoryModel();
+        rootCategory.setId(folder.getNodeRef());
         restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategory();
-        restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category");
+        restClient.assertStatusCodeIs(BAD_REQUEST);
     }
 
-    /**
-     * Check we get an error when passing non existing as category id
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testGetCategoryByIdProvidingNonExistingId()
-    {
-        STEP("Get category with id which does not exist");
-        final String id = NON_EXISTING_CATEGORY_ID;
-        final RestCategoryModel rootCategory = createCategoryModelWithId(id);
-        restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategory();
-        restClient.assertStatusCodeIs(NOT_FOUND).assertLastError().containsSummary(id);
-    }
-
-    /**
-     * Check we can get children category of a root category
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testGetCategoryChildren()
-    {
-        STEP("Get category children with -root- as parent id");
-        final RestCategoryModel rootCategory = createCategoryModelWithId(ROOT_CATEGORY_ID);
-        RestCategoryModelsCollection childCategoriesList =
-                restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategoryChildren();
-        restClient.assertStatusCodeIs(OK);
-
-        childCategoriesList.assertThat().entriesListIsNotEmpty();
-        assertTrue(childCategoriesList.getEntries().stream()
-                .map(RestCategoryModel::onModel)
-                .map(RestCategoryModel::getName)
-                .collect(Collectors.toList())
-                .containsAll(DEFAULT_ROOT_CATEGORIES));
-        STEP("Create a new category under root and make sure it is returned as one of root's children");
-        final RestCategoryModel aCategory = createCategoryModelWithName(RandomData.getRandomName("newCategoryUnderRoot"));
-        final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(rootCategory)
-                .createSingleCategory(aCategory);
-        restClient.assertStatusCodeIs(CREATED);
-
-        childCategoriesList = restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategoryChildren();
-        restClient.assertStatusCodeIs(OK);
-        assertTrue(childCategoriesList.getEntries().stream()
-                .map(RestCategoryModel::onModel)
-                .map(RestCategoryModel::getId)
-                .collect(Collectors.toList())
-                .contains(createdCategory.getId()));
-
-        STEP("Create 2 more categories under newCategoryUnderRoot and make sure they are returned as children");
-        final int categoriesCount = 2;
-        final List<RestCategoryModel> categoriesToCreate = CreateCategoriesTests.getCategoriesToCreate(categoriesCount);
-        final RestCategoryModelsCollection createdSubCategories = restClient.authenticateUser(dataUser.getAdminUser())
-                .withCoreAPI()
-                .usingCategory(createdCategory)
-                .createCategoriesList(categoriesToCreate);
-        restClient.assertStatusCodeIs(CREATED);
-        childCategoriesList = restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategoryChildren();
-        restClient.assertStatusCodeIs(OK);
-        childCategoriesList.getEntries().containsAll(createdSubCategories.getEntries());
-    }
-
-    /**
-     * Check we get an error when passing folder node id as parent category id when getting children.
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testGetCategoryChildrenProvidingFolderAsId()
-    {
-        STEP("Create a site and a folder inside it");
-        final SiteModel site = dataSite.usingUser(user).createPublicRandomSite();
-        final FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
-
-        STEP("Get category children with folder id passed as parent id");
-        final RestCategoryModel parentCategory = createCategoryModelWithId(folder.getNodeRef());
-        restClient.authenticateUser(user).withCoreAPI().usingCategory(parentCategory).getCategoryChildren();
-        restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category");
-    }
-
-    /**
-     * Check we get an error when passing a non-existent node id as parent category id when getting children.
-     */
-    @Test(groups = {TestGroup.REST_API})
-    public void testGetCategoryChildrenProvidingNonExistingParent()
-    {
-
-        STEP("Get category with folder id passed as id");
-        final String parentId = NON_EXISTING_CATEGORY_ID;
-        final RestCategoryModel parentCategory = createCategoryModelWithId(parentId);
-        restClient.authenticateUser(user).withCoreAPI().usingCategory(parentCategory).getCategoryChildren();
-        restClient.assertStatusCodeIs(NOT_FOUND).assertLastError().containsSummary(parentId);
-    }
 }

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/UpdateCategoriesTests.java

@@ -1,214 +0,0 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * 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.rest.categories;
-
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.OK;
-
-import org.alfresco.rest.model.RestCategoryModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.TestGroup;
-import org.alfresco.utility.model.UserModel;
-import org.testng.annotations.Test;
-
-public class UpdateCategoriesTests extends CategoriesRestTest
-{
-    private static final String CATEGORY_NEW_NAME_PREFIX = "NewCategoryName";
-    private static final String IGNORE_FIELD_NAME = FIELD_NAME;
-
-    /**
-     * Update a category (direct child of root category)
-     */
-    @Test(groups = { TestGroup.REST_API})
-    public void testUpdateCategory_asAdmin()
-    {
-        STEP("Prepare as admin a category under root category");
-        final RestCategoryModel createdCategory = prepareCategoryUnderRoot();
-
-        STEP("Update as admin newly created category");
-        final String categoryNewName = getRandomName(CATEGORY_NEW_NAME_PREFIX);
-        final RestCategoryModel fixedCategoryModel = createCategoryModelWithName(categoryNewName);
-        final RestCategoryModel updatedCategory = restClient.authenticateUser(dataUser.getAdminUser())
-            .withCoreAPI()
-            .usingCategory(createdCategory)
-            .updateCategory(fixedCategoryModel);
-
-        restClient.assertStatusCodeIs(OK);
-        updatedCategory.assertThat().isEqualTo(createdCategory, IGNORE_FIELD_NAME);
-        updatedCategory.assertThat().field(FIELD_NAME).isNot(createdCategory.getName());
-        updatedCategory.assertThat().field(FIELD_NAME).is(categoryNewName);
-    }
-
-    /**
-     * Update a subcategory of root's child category
-     */
-    @Test(groups = { TestGroup.REST_API})
-    public void testUpdateSubcategory_asAdmin()
-    {
-        STEP("Prepare as admin a category under root category");
-        final RestCategoryModel createdCategory = prepareCategoryUnderRoot();
-
-        STEP("Prepare as admin a subcategory of root's child category");
-        final RestCategoryModel createdSubcategory = prepareCategoryUnder(createdCategory.getId());
-
-        STEP("Update as admin newly created subcategory");
-        final String categoryNewName = getRandomName(CATEGORY_NEW_NAME_PREFIX);
-        final RestCategoryModel fixedCategoryModel = createCategoryModelWithName(categoryNewName);
-        final RestCategoryModel updatedCategory = restClient.authenticateUser(dataUser.getAdminUser())
-            .withCoreAPI()
-            .usingCategory(createdSubcategory)
-            .updateCategory(fixedCategoryModel);
-
-        restClient.assertStatusCodeIs(OK);
-        updatedCategory.assertThat().isEqualTo(createdSubcategory, IGNORE_FIELD_NAME);
-        updatedCategory.assertThat().field(FIELD_NAME).is(categoryNewName);
-    }
-
-    /**
-     * Try to update a category as a user and expect 403 (Forbidden) in response
-     */
-    @Test(groups = { TestGroup.REST_API})
-    public void testUpdateCategory_asUserAndExpect403()
-    {
-        STEP("Prepare as admin a category under root category");
-        final RestCategoryModel createdCategory = prepareCategoryUnderRoot();
-
-        STEP("Try to update as user newly created category");
-        final RestCategoryModel fixedCategoryModel = createCategoryModelWithName(getRandomName(CATEGORY_NEW_NAME_PREFIX));
-        restClient.authenticateUser(user)
-            .withCoreAPI()
-            .usingCategory(createdCategory)
-            .updateCategory(fixedCategoryModel);
-
-        restClient.assertStatusCodeIs(FORBIDDEN);
-    }
-
-    /**
-     * Try to update a non-existing category and receive 404 (Not Found)
-     */
-    @Test(groups = { TestGroup.REST_API})
-    public void testUpdateCategory_usingNonExistingCategoryAndExpect404()
-    {
-        STEP("Create a fake parent category");
-        final RestCategoryModel nonExistingCategory = createCategoryModelWithIdAndName("non-existing-dummy-id", getRandomName(CATEGORY_NAME_PREFIX));
-
-        STEP("Try to update as admin fake category");
-        final RestCategoryModel fixedCategoryModel = createCategoryModelWithName(getRandomName(CATEGORY_NEW_NAME_PREFIX));
-        restClient.authenticateUser(dataUser.getAdminUser())
-            .withCoreAPI()
-            .usingCategory(nonExistingCategory)
-            .updateCategory(fixedCategoryModel);
-
-        restClient.assertStatusCodeIs(NOT_FOUND);
-    }
-
-    /**
-     * Try to update a non-category (folder) node and receive 400 (Bad Request)
-     */
-    @Test(groups = { TestGroup.REST_API})
-    public void testUpdateCategory_usingFolderNodeAndExpect400()
-    {
-        STEP("Prepare a site and a folder inside it");
-        final UserModel user = dataUser.createRandomTestUser();
-        final SiteModel site = dataSite.usingUser(user).createPublicRandomSite();
-        final FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder();
-        final RestCategoryModel categoryWithFolderId = createCategoryModelWithIdAndName(folder.getNodeRef(), getRandomName(CATEGORY_NAME_PREFIX));
-
-        STEP("Try to update as admin folder node as category");
-        final RestCategoryModel fixedCategoryModel = createCategoryModelWithName(getRandomName(CATEGORY_NEW_NAME_PREFIX));
-        restClient.authenticateUser(dataUser.getAdminUser())
-            .withCoreAPI()
-            .usingCategory(categoryWithFolderId)
-            .updateCategory(fixedCategoryModel);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-    }
-
-    /**
-     * Try to update a root category and receive 400 (Bad Request)
-     */
-    @Test(groups = { TestGroup.REST_API})
-    public void testUpdateCategory_usingRootCategoryAndExpect400()
-    {
-        STEP("Create root category model");
-        final RestCategoryModel rootCategoryModel = createCategoryModelWithId(ROOT_CATEGORY_ID);
-
-        STEP("Try to update as admin root category");
-        final RestCategoryModel fixedCategoryModel = createCategoryModelWithName(getRandomName(CATEGORY_NEW_NAME_PREFIX));
-        restClient.authenticateUser(dataUser.getAdminUser())
-            .withCoreAPI()
-            .usingCategory(rootCategoryModel)
-            .updateCategory(fixedCategoryModel);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-    }
-
-    /**
-     * Try to update a category with an empty name and receive 400 (Bad Request)
-     */
-    @Test(groups = { TestGroup.REST_API})
-    public void testUpdateCategory_withEmptyNameAndExpect400()
-    {
-        STEP("Prepare as admin a category under root category");
-        final RestCategoryModel createdCategory = prepareCategoryUnderRoot();
-
-        STEP("Try to update as admin newly created category with a category without name");
-        final RestCategoryModel fixedCategoryModel = createCategoryModelWithName(null);
-        restClient.authenticateUser(dataUser.getAdminUser())
-            .withCoreAPI()
-            .usingCategory(createdCategory)
-            .updateCategory(fixedCategoryModel);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-    }
-
-    /**
-     * Try to update a category with an invalid, but not important ID in body and receive 200 (OK)
-     */
-    @Test(groups = { TestGroup.REST_API})
-    public void testUpdateCategory_withIgnoredInvalidIdInBodyAndExpect200()
-    {
-        STEP("Prepare as admin a category under root category");
-        final RestCategoryModel createdCategory = prepareCategoryUnderRoot();
-
-        STEP("Try to update as admin newly created category with a category with invalid ID and receive 200");
-        final String categoryNewName = getRandomName(CATEGORY_NEW_NAME_PREFIX);
-        final RestCategoryModel fixedCategoryModel = createCategoryModelWithIdAndName("non-existing-dummy-id", categoryNewName);
-        final RestCategoryModel updatedCategory = restClient.authenticateUser(dataUser.getAdminUser())
-            .withCoreAPI()
-            .usingCategory(createdCategory)
-            .updateCategory(fixedCategoryModel);
-
-        restClient.assertStatusCodeIs(OK);
-        updatedCategory.assertThat().field(FIELD_NAME).is(categoryNewName);
-    }
-}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java

@@ -56,7 +56,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import javax.json.Json;
 import javax.json.JsonObject;
@@ -64,7 +63,6 @@ import javax.json.JsonObject;
 import org.alfresco.rest.model.RestActionBodyExecTemplateModel;
 import org.alfresco.rest.model.RestActionConstraintModel;
 import org.alfresco.rest.model.RestCompositeConditionDefinitionModel;
-import org.alfresco.rest.model.RestPaginationModel;
 import org.alfresco.rest.model.RestRuleModel;
 import org.alfresco.rest.model.RestRuleModelsCollection;
 import org.alfresco.utility.constants.UserRole;
@@ -269,38 +267,6 @@ public class CreateRulesTests extends RulesRestTest
                     .assertThat().field("name").is(ruleNames.get(i)));
     }
 
-    /** Check we can create over 100 rules and get them all back in response. */
-    @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
-    public void createOver100Rules()
-    {
-        STEP("Create a list of 120 rules in one POST request");
-        final int ruleCount = 120;
-        final String ruleNamePrefix = "multiRule";
-        final List<RestRuleModel> ruleModels = IntStream.rangeClosed(1, ruleCount)
-                .mapToObj(i -> rulesUtils.createRuleModel(ruleNamePrefix + i))
-                .collect(Collectors.toList());
-
-        final FolderModel aFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-        final RestRuleModelsCollection rules = restClient.authenticateUser(user).withPrivateAPI().usingNode(aFolder).usingDefaultRuleSet()
-                .createListOfRules(ruleModels);
-
-        restClient.assertStatusCodeIs(CREATED);
-
-        assertEquals("Unexpected number of rules received in response.", ruleCount, rules.getEntries().size());
-        IntStream.range(0, ruleModels.size()).forEach(i ->
-                rules.getEntries().get(i).onModel()
-                        .assertThat().field("id").isNotNull()
-                        .assertThat().field("name").is(ruleNamePrefix + (i + 1)));
-
-        rules.getPagination()
-                .assertThat().field("count").is(ruleCount)
-                .assertThat().field("totalItems").is(ruleCount)
-                .assertThat().field("maxItems").is(ruleCount)
-                .assertThat().field("skipCount").is(0)
-                .assertThat().field("hasMoreItems").is(false);
-
-    }
-
     /** Try to create several rules with an error in one of them. */
     @Test (groups = { TestGroup.REST_API, TestGroup.RULES })
     public void createRulesWithOneError()

packaging/tests/tas-restapi/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

packaging/tests/tas-restapi/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

packaging/tests/tas-webdav/pom.xml

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

packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavTest.java

@@ -1,25 +1,17 @@
 package org.alfresco.webdav;
 
-import java.lang.reflect.Method;
-
 import org.alfresco.utility.data.DataContent;
 import org.alfresco.utility.data.DataSite;
 import org.alfresco.utility.data.DataUser;
-import org.alfresco.utility.LogFactory;
 import org.alfresco.utility.network.ServerHealth;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.slf4j.Logger;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeSuite;
 
 @ContextConfiguration("classpath:alfresco-webdav-context.xml")
 public abstract class WebDavTest extends AbstractTestNGSpringContextTests
 {
-    private static final Logger LOG = LogFactory.getLogger();
-
     @Autowired
     protected DataSite dataSite;
 
@@ -44,16 +36,4 @@ public abstract class WebDavTest extends AbstractTestNGSpringContextTests
         // The webdav protocol is enabled by default.
         //webDavProtocol.assertThat().protocolIsEnabled();
     }
-
-    @BeforeMethod(alwaysRun=true)
-    public void showStartTestInfo(Method method)
-    {
-        LOG.info(String.format("*** STARTING Test: [%s] ***", method.getName()));
-    }
-
-    @AfterMethod(alwaysRun=true)
-    public void showEndTestInfo(Method method)
-    {
-        LOG.info(String.format("*** ENDING Test: [%s] ***", method.getName()));
-    }
-}
+}

packaging/tests/tas-webdav/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

packaging/tests/tas-webdav/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

packaging/war/pom.xml

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

packaging/war/src/main/resources/log4j2.properties

@@ -29,6 +29,7 @@ appender.rolling.policies.time.interval = 1
 # Log4j addLoggerMBean as long as the logger exists and has been loaded.
 
 # Hibernate
+
 logger.hibernate.name=org.hibernate
 logger.hibernate.level=error
 
@@ -44,29 +45,42 @@ logger.hibernate-type.level=warn
 logger.hibernate-cfg-SettingsFactory.name=org.hibernate.cfg.SettingsFactory
 logger.hibernate-cfg-SettingsFactory.level=warn
 
+
+
 # Spring
+
 logger.springframework.name=org.springframework
 logger.springframework.level=warn
 
 # Turn off Spring remoting warnings that should really be info or debug.
+
 logger.springframework-remoting-support.name=org.springframework.remoting.support
 logger.springframework-remoting-support.level=error
 
 logger.springframework-util.name=org.springframework.util
 logger.springframework-util.level=error
 
+
+
 # Axis/WSS4J
+
 logger.apache-axis.name=org.apache.axis
 logger.apache-axis.level=info
 
 logger.apache-ws.name=org.apache.ws
 logger.apache-ws.level=info
 
+
+
 # CXF
+
 logger.apache-cxf.name=org.apache.cxf
 logger.apache-cxf.level=error
 
+
+
 # MyFaces
+
 logger.apache-myfaces-util-DebugUtils.name=org.apache.myfaces.util.DebugUtils
 logger.apache-myfaces-util-DebugUtils.level=info
 
@@ -79,11 +93,17 @@ logger.apache-myfaces-application-jsp-JspViewHandlerImpl.level=error
 logger.apache-myfaces-taglib.name=org.apache.myfaces.taglib
 logger.apache-myfaces-taglib.level=error
 
+
+
 # log prepared statement cache activity ###
+
 logger.hibernate-ps-PreparedStatementCache.name=org.hibernate.ps.PreparedStatementCache
 logger.hibernate-ps-PreparedStatementCache.level=info
 
+
+
 # Alfresco
+
 logger.alfresco.name=org.alfresco
 logger.alfresco.level=error
 
@@ -126,6 +146,8 @@ logger.alfresco-repo-security-sync.level=info
 logger.alfresco-repo-security-person.name=org.alfresco.repo.security.person
 logger.alfresco-repo-security-person.level=info
 
+
+
 logger.alfresco-sample.name=org.alfresco.sample
 logger.alfresco-sample.level=info
 
@@ -150,25 +172,34 @@ logger.alfresco-service-descriptor-DescriptorService.level=info
 #logger.alfresco-web-page.name=org.alfresco.web.page
 #logger.alfresco-web-page.level=debug
 
+
+
 logger.alfresco-repo-importer-ImporterBootstrap.name=org.alfresco.repo.importer.ImporterBootstrap
 logger.alfresco-repo-importer-ImporterBootstrap.level=error
 
 #logger.alfresco-repo-importer-ImporterBootstrap.name=org.alfresco.repo.importer.ImporterBootstrap
 #logger.alfresco-repo-importer-ImporterBootstrap.level=info
 
+
+
 logger.alfresco-repo-admin-patch-PatchExecuter.name=org.alfresco.repo.admin.patch.PatchExecuter
 logger.alfresco-repo-admin-patch-PatchExecuter.level=info
 
 logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.name=org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl
 logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.level=info
 
+
+
 # Specific patches
+
 logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.name=org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch
 logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.level=info
 
 logger.alfresco-repo-version-VersionMigrator.name=org.alfresco.repo.version.VersionMigrator
 logger.alfresco-repo-version-VersionMigrator.level=info
 
+
+
 logger.alfresco-repo-module-ModuleServiceImpl.name=org.alfresco.repo.module.ModuleServiceImpl
 logger.alfresco-repo-module-ModuleServiceImpl.level=info
 
@@ -208,49 +239,74 @@ logger.alfresco-enterprise-repo-cluster.level=info
 logger.alfresco-repo-version-Version2ServiceImpl.name=org.alfresco.repo.version.Version2ServiceImpl
 logger.alfresco-repo-version-Version2ServiceImpl.level=warn
 
+
+
 #logger.alfresco-web-app-DebugPhaseListener.name=org.alfresco.web.app.DebugPhaseListener
 #logger.alfresco-web-app-DebugPhaseListener.level=debug
 
 logger.alfresco-repo-node-db-NodeStringLengthWorker.name=org.alfresco.repo.node.db.NodeStringLengthWorker
 logger.alfresco-repo-node-db-NodeStringLengthWorker.level=info
 
+
+
 logger.alfresco-repo-workflow.name=org.alfresco.repo.workflow
 logger.alfresco-repo-workflow.level=info
 
+
+
 # FTP server debugging
+
 logger.alfresco-ftp-protocol.name=org.alfresco.ftp.protocol
 logger.alfresco-ftp-protocol.level=error
 
 #logger.alfresco-ftp-server.name=org.alfresco.ftp.server
 #logger.alfresco-ftp-server.level=debug
 
+
+
 # WebDAV debugging
+
 #logger.alfresco-webdav-protocol.name=org.alfresco.webdav.protocol
 #logger.alfresco-webdav-protocol.level=debug
 
 logger.alfresco-webdav-protocol.name=org.alfresco.webdav.protocol
 logger.alfresco-webdav-protocol.level=info
 
+
+
 # Kerberos servlet filters
+
 #logger.alfresco-web-app-servlet-KerberosAuthenticationFilter.name=org.alfresco.web.app.servlet.KerberosAuthenticationFilter
 #logger.alfresco-web-app-servlet-KerberosAuthenticationFilter.level=debug
 
 #logger.alfresco-repo-webdav-auth-KerberosAuthenticationFilter.name=org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter
 #logger.alfresco-repo-webdav-auth-KerberosAuthenticationFilter.level=debug
 
+
+
 # File servers
+
 logger.alfresco-fileserver.name=org.alfresco.fileserver
 logger.alfresco-fileserver.level=warn
 
+
+
 # Repo filesystem debug logging
+
 #logger.alfresco-filesys-repo-ContentDiskDriver.name=org.alfresco.filesys.repo.ContentDiskDriver
 #logger.alfresco-filesys-repo-ContentDiskDriver.level=debug
 
+
+
 # Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
+
 logger.alfresco-repo-node-integrity.name=org.alfresco.repo.node.integrity
 logger.alfresco-repo-node-integrity.level=error
 
+
+
 # Authentication
+
 logger.alfresco-filesys-auth-ftp.name=org.alfresco.filesys.auth.ftp
 logger.alfresco-filesys-auth-ftp.level=warn
 
@@ -267,16 +323,22 @@ logger.alfresco-web-app-servlet.name=org.alfresco.web.app.servlet
 logger.alfresco-web-app-servlet.level=warn
 
 # Used also for brute force attack detection
+
 logger.alfresco-repo-security-authentication.name=org.alfresco.repo.security.authentication
 logger.alfresco-repo-security-authentication.level=warn
 
+
+
 # Indexer debugging
+
 logger.alfresco-repo-search-Indexer.name=org.alfresco.repo.search.Indexer
 logger.alfresco-repo-search-Indexer.level=error
 
 #logger.alfresco-repo-search-Indexer.name=org.alfresco.repo.search.Indexer
 #logger.alfresco-repo-search-Indexer.level=debug
 
+
+
 logger.alfresco-repo-search-impl-lucene-index.name=org.alfresco.repo.search.impl.lucene.index
 logger.alfresco-repo-search-impl-lucene-index.level=error
 
@@ -286,62 +348,97 @@ logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.level=warn
 #logger.alfresco-repo-search-impl-lucene-index.name=org.alfresco.repo.search.impl.lucene.index
 #logger.alfresco-repo-search-impl-lucene-index.level=debug
 
+
+
 # Audit debugging
+
 #logger.alfresco-repo-audit.name=org.alfresco.repo.audit
 #logger.alfresco-repo-audit.level=debug
 #logger.alfresco-repo-audit-model.name=org.alfresco.repo.audit.model
 #logger.alfresco-repo-audit-model.level=debug
 
+
 # Property sheet and modelling debugging
+
 # change to error to hide the warnings about missing properties and associations
+
 logger.missingProperties.name=alfresco.missingProperties
 logger.missingProperties.level=warn
 
+
+
 # Dictionary/Model debugging
+
 logger.alfresco-repo-dictionary.name=org.alfresco.repo.dictionary
 logger.alfresco-repo-dictionary.level=warn
 
 logger.alfresco-repo-dictionary-types-period.name=org.alfresco.repo.dictionary.types.period
 logger.alfresco-repo-dictionary-types-period.level=warn
 
+
+
 # Virtualization Server Registry
+
 logger.alfresco-mbeans-VirtServerRegistry.name=org.alfresco.mbeans.VirtServerRegistry
 logger.alfresco-mbeans-VirtServerRegistry.level=error
 
+
+
 # Spring context runtime property setter
+
 logger.alfresco-util-RuntimeSystemPropertiesSetter.name=org.alfresco.util.RuntimeSystemPropertiesSetter
 logger.alfresco-util-RuntimeSystemPropertiesSetter.level=info
 
+
+
 # Debugging options for clustering
+
 logger.alfresco-repo-content-ReplicatingContentStore.name=org.alfresco.repo.content.ReplicatingContentStore
 logger.alfresco-repo-content-ReplicatingContentStore.level=error
 
 logger.alfresco-repo-content-replication.name=org.alfresco.repo.content.replication
 logger.alfresco-repo-content-replication.level=error
 
+
+
 #logger.alfresco-repo-deploy-DeploymentServiceImpl.name=org.alfresco.repo.deploy.DeploymentServiceImpl
 #logger.alfresco-repo-deploy-DeploymentServiceImpl.level=debug
 
+
+
 # Activity service
+
 logger.alfresco-repo-activities.name=org.alfresco.repo.activities
 logger.alfresco-repo-activities.level=warn
 
+
+
 # User usage tracking
+
 logger.alfresco-repo-usage.name=org.alfresco.repo.usage
 logger.alfresco-repo-usage.level=info
 
+
+
 # Sharepoint
+
 logger.alfresco-module-vti.name=org.alfresco.module.vti
 logger.alfresco-module-vti.level=info
 
+
+
 # Forms Engine
+
 logger.alfresco-web-config-forms.name=org.alfresco.web.config.forms
 logger.alfresco-web-config-forms.level=info
 
 logger.alfresco-web-scripts-forms.name=org.alfresco.web.scripts.forms
 logger.alfresco-web-scripts-forms.level=info
 
+
+
 # CMIS
+
 logger.alfresco-opencmis.name=org.alfresco.opencmis
 logger.alfresco-opencmis.level=error
 
@@ -363,20 +460,35 @@ logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.l
 logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.name=org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet
 logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.level=off
 
+
+
 # IMAP
+
 logger.alfresco-repo-imap.name=org.alfresco.repo.imap
 logger.alfresco-repo-imap.level=info
 
+
+
 # JBPM
+
 # Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler
+
 logger.jbpm-graph-def-GraphElement.name=org.jbpm.graph.def.GraphElement
 logger.jbpm-graph-def-GraphElement.level=fatal
 
+
+
 #logger.alfresco-repo-googledocs.name=org.alfresco.repo.googledocs
 #logger.alfresco-repo-googledocs.level=debug
 
+
+
 ###### Scripting #######
+
+
+
 # Web Framework
+
 logger.springframework-extensions-webscripts.name=org.springframework.extensions.webscripts
 logger.springframework-extensions-webscripts.level=info
 
@@ -386,7 +498,10 @@ logger.springframework-extensions-webscripts-ScriptLogger.level=warn
 logger.springframework-extensions-webscripts-ScriptDebugger.name=org.springframework.extensions.webscripts.ScriptDebugger
 logger.springframework-extensions-webscripts-ScriptDebugger.level=off
 
+
+
 # Repository
+
 logger.alfresco-repo-web-scripts.name=org.alfresco.repo.web.scripts
 logger.alfresco-repo-web-scripts.level=warn
 
@@ -405,6 +520,8 @@ logger.alfresco-repo-jscript-ScriptLogger.level=warn
 logger.alfresco-repo-cmis-rest-CMISTest.name=org.alfresco.repo.cmis.rest.CMISTest
 logger.alfresco-repo-cmis-rest-CMISTest.level=info
 
+
+
 logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl
 logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.level=off
 
@@ -414,63 +531,103 @@ logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.level=info
 logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.name=org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor
 logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.level=off
 
+
+
 logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.name=org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl
 logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.level=info
 
+
+
 # Bulk Filesystem Import Tool
+
 logger.alfresco-repo-bulkimport.name=org.alfresco.repo.bulkimport
 logger.alfresco-repo-bulkimport.level=warn
 
+
+
 # Freemarker
+
 # Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+
 logger.runtime.name=freemarker.runtime
 logger.runtime.level=
 
+
+
 # Metadata extraction
+
 logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.name=org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter
 logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.level=warn
 
+
+
 # no index support
+
 logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.name=org.alfresco.repo.search.impl.noindex.NoIndexIndexer
 logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.level=fatal
 
 logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.name=org.alfresco.repo.search.impl.noindex.NoIndexSearchService
 logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.level=fatal
 
+
+
 # lucene index warnings
+
 logger.alfresco-repo-search-impl-lucene-index-IndexInfo.name=org.alfresco.repo.search.impl.lucene.index.IndexInfo
 logger.alfresco-repo-search-impl-lucene-index-IndexInfo.level=warn
 
+
+
 # Warn about RMI socket bind retries.
+
 logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.name=org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory
 logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.level=warn
 
+
+
 logger.alfresco-repo-usage-RepoUsageMonitor.name=org.alfresco.repo.usage.RepoUsageMonitor
 logger.alfresco-repo-usage-RepoUsageMonitor.level=info
 
+
+
 # Authorization
+
 logger.alfresco-enterprise-repo-authorization-AuthorizationService.name=org.alfresco.enterprise.repo.authorization.AuthorizationService
 logger.alfresco-enterprise-repo-authorization-AuthorizationService.level=info
 
 logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.name=org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor
 logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.level=warn
 
+
+
 # HeartBeat
+
 logger.alfresco-heartbeat.name=org.alfresco.heartbeat
 logger.alfresco-heartbeat.level=info
 
+
+
 # Transformations
+
 #logger.alfresco-repo-content-transform-TransformerDebug.name=org.alfresco.repo.content.transform.TransformerDebug
 #logger.alfresco-repo-content-transform-TransformerDebug.level=debug
 
+
+
 logger.alfresco-repo-content-transform.name=org.alfresco.repo.content.transform
 logger.alfresco-repo-content-transform.level=info
 
+
+
 # Repository probes
+
 logger.alfresco-rest-api-probes-ProbeEntityResource.name=org.alfresco.rest.api.probes.ProbeEntityResource
 logger.alfresco-rest-api-probes-ProbeEntityResource.level=info
 
+
+
 # ActiveMQ
 
 logger.apache-activemq-transport-failover.name=org.apache.activemq.transport.failover
-logger.apache-activemq-transport-failover.level=warn
+logger.apache-activemq-transport-failover.level=warn
+

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>20.50-SNAPSHOT</version>
+    <version>20.36-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -109,8 +109,8 @@
         <dependency.jakarta-json-path.version>2.7.0</dependency.jakarta-json-path.version>
         <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
 
-        <alfresco.googledrive.version>3.4.0-A1</alfresco.googledrive.version>
-        <alfresco.aos-module.version>1.6.0-A1</alfresco.aos-module.version>
+        <alfresco.googledrive.version>3.3.1-DEV-LOG4J2</alfresco.googledrive.version>
+        <alfresco.aos-module.version>1.5.0-DEV-LOG4J2</alfresco.aos-module.version>
         <alfresco.api-explorer.version>7.3.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
@@ -120,7 +120,7 @@
         <dependency.mysql.version>8.0.30</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.57</dependency.tas-utility.version>
+        <dependency.tas-utility.version>3.0.56</dependency.tas-utility.version>
         <dependency.rest-assured.version>5.2.0</dependency.rest-assured.version>
         <dependency.tas-email.version>1.11</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.7</dependency.tas-webdav.version>

remote-api/pom.xml

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

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

@@ -26,31 +26,13 @@
 
 package org.alfresco.rest.api;
 
-import java.util.List;
-
 import org.alfresco.rest.api.model.Category;
-import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.repository.NodeRef;
 
 @Experimental
 public interface Categories
 {
-    Category getCategoryById(String id, Parameters parameters);
-
-    List<Category> createSubcategories(String parentCategoryId, List<Category> categories, Parameters parameters);
-
-    CollectionWithPagingInfo<Category> getCategoryChildren(String parentCategoryId, Parameters parameters);
-
-    /**
-     * Update category by ID. Currently, it's possible only to update the name of category.
-     *
-     * @param id Category ID.
-     * @param fixedCategoryModel Fixed category model.
-     * @return Updated category.
-     */
-    Category updateCategoryById(String id, Category fixedCategoryModel);
-
-    void deleteCategoryById(String id, Parameters parameters);
-
+    Category getCategoryById(String id, Parameters params);
 }

remote-api/src/main/java/org/alfresco/rest/api/categories/CategoriesEntityResource.java

@@ -41,9 +41,7 @@ import org.alfresco.rest.framework.resource.parameters.Parameters;
  * @author mpichura
  */
 @EntityResource(name = "categories", title = "Categories")
-public class CategoriesEntityResource implements EntityResourceAction.ReadById<Category>,
-                                                 EntityResourceAction.Update<Category>,
-                                                 EntityResourceAction.Delete
+public class CategoriesEntityResource implements EntityResourceAction.ReadById<Category>
 {
     private final Categories categories;
 
@@ -52,45 +50,12 @@ public class CategoriesEntityResource implements EntityResourceAction.ReadById<C
         this.categories = categories;
     }
 
-    /**
-     * GET /categories/{categoryId}
-     */
-    @WebApiDescription(
-        title = "Get category by its ID",
-        description = "Retrieves a category given category node id",
-        successStatus = HttpServletResponse.SC_OK
-    )
+    @WebApiDescription(title = "Get category by its id",
+            description = "Retrieves a category given category node id",
+            successStatus = HttpServletResponse.SC_OK)
     @Override
     public Category readById(String id, Parameters parameters) throws EntityNotFoundException
     {
         return categories.getCategoryById(id, parameters);
     }
-
-    /**
-     * PUT /categories/{categoryId}
-     */
-    @WebApiDescription(
-        title = "Update category",
-        description = "Update a single category by its ID",
-        successStatus = HttpServletResponse.SC_OK
-    )
-    @Override
-    public Category update(String id, Category categoryModel, Parameters parameters)
-    {
-        return categories.updateCategoryById(id, categoryModel);
-    }
-
-    /**
-     * DELETE /categories/{categoryId}
-     */
-    @WebApiDescription(
-        title = "Delete category",
-        description = "Delete a category given its node ID",
-        successStatus = HttpServletResponse.SC_NO_CONTENT
-    )
-    @Override
-    public void delete(String id, Parameters parameters)
-    {
-        categories.deleteCategoryById(id, parameters);
-    }
 }

remote-api/src/main/java/org/alfresco/rest/api/categories/SubcategoriesRelation.java

@@ -1,76 +0,0 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * 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.rest.api.categories;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.alfresco.rest.api.Categories;
-import org.alfresco.rest.api.model.Category;
-import org.alfresco.rest.framework.WebApiDescription;
-import org.alfresco.rest.framework.resource.RelationshipResource;
-import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
-import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
-import org.alfresco.rest.framework.resource.parameters.Parameters;
-
-@RelationshipResource(name = "subcategories",  entityResource = CategoriesEntityResource.class, title = "Subcategories")
-public class SubcategoriesRelation implements RelationshipResourceAction.Create<Category>,
-                                              RelationshipResourceAction.Read<Category>
-{
-
-    private final Categories categories;
-
-    public SubcategoriesRelation(Categories categories)
-    {
-        this.categories = categories;
-    }
-
-    /**
-     * POST /categories/{categoryId}/subcategories
-     */
-    @WebApiDescription(title = "Create a category",
-            description = "Creates one or more categories under a parent category",
-            successStatus = HttpServletResponse.SC_CREATED)
-    @Override
-    public List<Category> create(String parentCategoryId, List<Category> categoryList, Parameters parameters)
-    {
-        return categories.createSubcategories(parentCategoryId, categoryList, parameters);
-    }
-
-    /**
-     * GET /categories/{categoryId}/subcategories
-     */
-    @WebApiDescription(title = "List category direct children",
-            description = "Lists direct children of a parent category",
-            successStatus = HttpServletResponse.SC_OK)
-    @Override
-    public CollectionWithPagingInfo<Category> readAll(String parentCategoryId, Parameters params)
-    {
-        return categories.getCategoryChildren(parentCategoryId, params);
-    }
-}

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

@@ -29,48 +29,31 @@ package org.alfresco.rest.api.impl;
 import static org.alfresco.rest.api.Nodes.PATH_ROOT;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.rest.api.Categories;
 import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.model.Category;
 import org.alfresco.rest.api.model.Node;
-import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
-import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
-import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
-import org.alfresco.rest.framework.resource.parameters.ListPage;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 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.cmr.search.CategoryService;
-import org.alfresco.service.cmr.security.AuthorityService;
-import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 
 @Experimental
 public class CategoriesImpl implements Categories
 {
     static final String NOT_A_VALID_CATEGORY = "Node id does not refer to a valid category";
-    static final String NO_PERMISSION_TO_MANAGE_A_CATEGORY = "Current user does not have permission to manage a category";
-    static final String NOT_NULL_OR_EMPTY = "Category name must not be null or empty";
-    static final String FIELD_NOT_MATCH = "Category field: %s does not match the original one";
 
-    private final AuthorityService authorityService;
-    private final CategoryService categoryService;
     private final Nodes nodes;
     private final NodeService nodeService;
 
-    public CategoriesImpl(AuthorityService authorityService, CategoryService categoryService, Nodes nodes, NodeService nodeService)
+    public CategoriesImpl(Nodes nodes, NodeService nodeService)
     {
-        this.authorityService = authorityService;
-        this.categoryService = categoryService;
         this.nodes = nodes;
         this.nodeService = nodeService;
     }
@@ -78,135 +61,28 @@ public class CategoriesImpl implements Categories
     @Override
     public Category getCategoryById(final String id, final Parameters params)
     {
-        final NodeRef nodeRef = getCategoryNodeRef(id);
-        if (isRootCategory(nodeRef))
+        final NodeRef nodeRef = nodes.validateNode(id);
+        final boolean isCategory = nodes.isSubClass(nodeRef, ContentModel.TYPE_CATEGORY, false);
+        if (!isCategory || isRootCategory(nodeRef))
         {
             throw new InvalidArgumentException(NOT_A_VALID_CATEGORY, new String[]{id});
         }
-
-        return mapToCategory(nodeRef);
-    }
-
-    @Override
-    public List<Category> createSubcategories(String parentCategoryId, List<Category> categories, Parameters parameters)
-    {
-        verifyAdminAuthority();
-        final NodeRef parentNodeRef = getCategoryNodeRef(parentCategoryId);
-        final List<NodeRef> categoryNodeRefs = categories.stream()
-                .map(c -> createCategoryNodeRef(parentNodeRef, c))
-                .collect(Collectors.toList());
-        return categoryNodeRefs.stream()
-                .map(this::mapToCategory)
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public CollectionWithPagingInfo<Category> getCategoryChildren(String parentCategoryId, Parameters params)
-    {
-        final NodeRef parentNodeRef = getCategoryNodeRef(parentCategoryId);
-        final List<ChildAssociationRef> childCategoriesAssocs = nodeService.getChildAssocs(parentNodeRef).stream()
-                .filter(ca -> ContentModel.ASSOC_SUBCATEGORIES.equals(ca.getTypeQName()))
-                .collect(Collectors.toList());
-        final List<Category> categories = childCategoriesAssocs.stream()
-                .map(c -> mapToCategory(c.getChildRef()))
-                .collect(Collectors.toList());
-        return ListPage.of(categories, params.getPaging());
-    }
-
-    @Override
-    public Category updateCategoryById(final String id, final Category fixedCategoryModel)
-    {
-        verifyAdminAuthority();
-        final NodeRef categoryNodeRef = getCategoryNodeRef(id);
-        if (isRootCategory(categoryNodeRef))
-        {
-            throw new InvalidArgumentException(NOT_A_VALID_CATEGORY, new String[]{id});
-        }
-
-        verifyCategoryFields(fixedCategoryModel);
-
-        return mapToCategory(changeCategoryName(categoryNodeRef, fixedCategoryModel.getName()));
-    }
-
-    @Override
-    public void deleteCategoryById(String id, Parameters parameters)
-    {
-        verifyAdminAuthority();
-        final NodeRef nodeRef = getCategoryNodeRef(id);
-        if (isRootCategory(nodeRef))
-        {
-            throw new InvalidArgumentException(NOT_A_VALID_CATEGORY, new String[]{id});
-        }
-
-        nodeService.deleteNode(nodeRef);
-    }
-
-    private void verifyAdminAuthority()
-    {
-        if (!authorityService.hasAdminAuthority())
-        {
-            throw new PermissionDeniedException(NO_PERMISSION_TO_MANAGE_A_CATEGORY);
-        }
-    }
-
-    /**
-     * This method gets category NodeRef for a given category id.
-     * If '-root-' is passed as category id, then it's retrieved as a call to {@link org.alfresco.service.cmr.search.CategoryService#getRootCategoryNodeRef}
-     * In all other cases it's retrieved as a node of a category type {@link #validateCategoryNode(String)}
-     * @param nodeId category node id
-     * @return NodRef of category node
-     */
-    private NodeRef getCategoryNodeRef(String nodeId)
-    {
-        return PATH_ROOT.equals(nodeId) ?
-                categoryService.getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE)
-                        .orElseThrow(() -> new EntityNotFoundException(nodeId)) :
-                validateCategoryNode(nodeId);
-    }
-
-    /**
-     * Validates if the node exists and is a category.
-     * @param nodeId (presumably) category node id
-     * @return category NodeRef
-     */
-    private NodeRef validateCategoryNode(String nodeId)
-    {
-        final NodeRef nodeRef = nodes.validateNode(nodeId);
-        if (isNotACategory(nodeRef))
-        {
-            throw new InvalidArgumentException(NOT_A_VALID_CATEGORY, new String[]{nodeId});
-        }
-        return nodeRef;
-    }
-
-    private NodeRef createCategoryNodeRef(NodeRef parentNodeRef, Category c)
-    {
-        verifyCategoryFields(c);
-        return categoryService.createCategory(parentNodeRef, c.getName());
-    }
-
-    private Category mapToCategory(NodeRef nodeRef)
-    {
         final Node categoryNode = nodes.getNode(nodeRef.getId());
+        final Category category = new Category();
+        category.setId(nodeRef.getId());
+        category.setName(categoryNode.getName());
+        category.setParentId(getParentId(nodeRef));
         final boolean hasChildren = CollectionUtils
                 .isNotEmpty(nodeService.getChildAssocs(nodeRef, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false));
-        return Category.builder()
-                .id(nodeRef.getId())
-                .name(categoryNode.getName())
-                .parentId(getParentId(nodeRef))
-                .hasChildren(hasChildren)
-                .create();
-    }
+        category.setHasChildren(hasChildren);
 
-    private boolean isNotACategory(NodeRef nodeRef)
-    {
-        return !nodes.isSubClass(nodeRef, ContentModel.TYPE_CATEGORY, false);
+        return category;
     }
 
     private boolean isRootCategory(final NodeRef nodeRef)
     {
         final List<ChildAssociationRef> parentAssocs = nodeService.getParentAssocs(nodeRef);
-        return parentAssocs.stream().anyMatch(pa -> ContentModel.ASPECT_GEN_CLASSIFIABLE.equals(pa.getQName()));
+        return parentAssocs.stream().anyMatch(pa -> pa.getQName().equals(ContentModel.ASPECT_GEN_CLASSIFIABLE));
     }
 
     private String getParentId(final NodeRef nodeRef)
@@ -214,37 +90,4 @@ public class CategoriesImpl implements Categories
         final NodeRef parentRef = nodeService.getPrimaryParent(nodeRef).getParentRef();
         return isRootCategory(parentRef) ? PATH_ROOT : parentRef.getId();
     }
-
-    /**
-     * Change category qualified name.
-     *
-     * @param categoryNodeRef Category node reference.
-     * @param newName New name.
-     * @return Updated category.
-     */
-    private NodeRef changeCategoryName(final NodeRef categoryNodeRef, final String newName)
-    {
-        final ChildAssociationRef parentAssociation = nodeService.getPrimaryParent(categoryNodeRef);
-        if (parentAssociation == null)
-        {
-            throw new InvalidArgumentException(NOT_A_VALID_CATEGORY, new String[]{categoryNodeRef.getId()});
-        }
-
-        nodeService.setProperty(categoryNodeRef, ContentModel.PROP_NAME, newName);
-        final QName newQName = QName.createQName(parentAssociation.getQName().getNamespaceURI(), QName.createValidLocalName(newName));
-        return nodeService.moveNode(parentAssociation.getChildRef(), parentAssociation.getParentRef(), parentAssociation.getTypeQName(), newQName).getChildRef();
-    }
-
-    /**
-     * Verify if fixed category name is not empty.
-     *
-     * @param fixedCategoryModel Fixed category model.
-     */
-    private void verifyCategoryFields(final Category fixedCategoryModel)
-    {
-        if (StringUtils.isEmpty(fixedCategoryModel.getName()))
-        {
-            throw new InvalidArgumentException(NOT_NULL_OR_EMPTY);
-        }
-    }
 }

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

@@ -26,8 +26,6 @@
 
 package org.alfresco.rest.api.model;
 
-import java.util.Objects;
-
 public class Category
 {
     private String id;
@@ -74,67 +72,4 @@ public class Category
     {
         this.hasChildren = hasChildren;
     }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Category category = (Category) o;
-        return hasChildren == category.hasChildren && Objects.equals(id, category.id) && name.equals(category.name) &&
-                Objects.equals(parentId, category.parentId);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(id, name, parentId, hasChildren);
-    }
-
-    public static Builder builder()
-    {
-        return new Builder();
-    }
-
-    public static class Builder
-    {
-        private String id;
-        private String name;
-        private String parentId;
-        private boolean hasChildren;
-
-        public Builder id(String id)
-        {
-            this.id = id;
-            return this;
-        }
-
-        public Builder name(String name)
-        {
-            this.name = name;
-            return this;
-        }
-
-        public Builder parentId(String parentId)
-        {
-            this.parentId = parentId;
-            return this;
-        }
-
-        public Builder hasChildren(boolean hasChildren)
-        {
-            this.hasChildren = hasChildren;
-            return this;
-        }
-
-        public Category create()
-        {
-            final Category category = new Category();
-            category.setId(id);
-            category.setName(name);
-            category.setParentId(parentId);
-            category.setHasChildren(hasChildren);
-            return category;
-        }
-    }
 }

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

@@ -0,0 +1,39 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * 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.rest.framework.core.exceptions;
+
+/**
+ * The addressed Relationship Resource was not found
+ */
+public class EventAlreadyExistsException extends ApiException {
+
+    private static final long serialVersionUID = -3675294374348951929L;
+
+    public EventAlreadyExistsException(String msgId, Object[] msgParams) {
+        super(msgId, msgParams);
+    }
+}

remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPost.java

@@ -44,7 +44,6 @@ import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartResource
 import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelationshipResourceAction;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
-import org.alfresco.rest.framework.resource.parameters.Paging;
 import org.alfresco.rest.framework.resource.parameters.Params;
 import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams;
 import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
@@ -378,8 +377,7 @@ public class ResourceWebScriptPost extends AbstractResourceWebScript implements
     {
         if (created !=null && created.size() > 1)
         {
-            final Paging pagingAll = Paging.valueOf(0, created.size());
-            return CollectionWithPagingInfo.asPaged(pagingAll, created);
+            return CollectionWithPagingInfo.asPagedCollection(created.toArray());
         }
         else
         {

remote-api/src/main/resources/alfresco/messages/rest-framework-messages.properties

@@ -7,6 +7,8 @@ framework.exception.InvalidQuery=An invalid WHERE query was received. {0}
 framework.exception.InvalidSelect=An invalid {1} query was received. {0}
 framework.exception.NotFound={0} was not found
 framework.exception.EntityNotFound=The entity with id: {0} was not found
+framework.exception.CreateEventAlreadyExists=Cannot create event. An event with name: {0} already exists
+framework.exception.UpdateEventAlreadyExists=Cannot update event. An event with name: {0} already exists
 framework.exception.RelationshipNotFound=The relationship resource was not found for the entity with id: {0} and a relationship id of {1}
 framework.exception.PermissionDenied=Permission was denied
 framework.exception.StaleEntity=Attempt to update a stale entity

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

@@ -830,8 +830,6 @@
     </bean>
 
     <bean id="categories" class="org.alfresco.rest.api.impl.CategoriesImpl">
-        <constructor-arg name="authorityService" ref="AuthorityService"/>
-        <constructor-arg name="categoryService" ref="CategoryService"/>
         <constructor-arg name="nodes" ref="nodes"/>
         <constructor-arg name="nodeService" ref="NodeService"/>
     </bean>
@@ -1101,14 +1099,10 @@
         <constructor-arg name="categories" ref="Categories"/>
     </bean>
 
-    <bean class="org.alfresco.rest.api.categories.SubcategoriesRelation">
-        <constructor-arg name="categories" ref="Categories"/>
-    </bean>
-
     <bean class="org.alfresco.rest.api.tags.TagsEntityResource">
         <property name="tags" ref="Tags" />
     </bean>
-	
+
     <bean class="org.alfresco.rest.api.people.PersonSitesRelation">
         <property name="sites" ref="Sites" />
     </bean>

remote-api/src/test/java/org/alfresco/rest/api/categories/CategoriesEntityResourceTest.java

@@ -26,9 +26,7 @@
 
 package org.alfresco.rest.api.categories;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
 
@@ -67,17 +65,4 @@ public class CategoriesEntityResourceTest
         then(categoriesMock).shouldHaveNoMoreInteractions();
         assertEquals(categoryMock, category);
     }
-
-    @Test
-    public void testUpdateCategoryById()
-    {
-        given(categoriesMock.updateCategoryById(any(), any())).willReturn(categoryMock);
-
-        // when
-        final Category actualCategory = objectUnderTest.update(CATEGORY_ID, categoryMock, parametersMock);
-
-        then(categoriesMock).should().updateCategoryById(CATEGORY_ID, categoryMock);
-        then(categoriesMock).shouldHaveNoMoreInteractions();
-        assertThat(actualCategory).isNotNull();
-    }
 }

remote-api/src/test/java/org/alfresco/rest/api/categories/SubcategoriesRelationTest.java

@@ -1,105 +0,0 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * 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.rest.api.categories;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.then;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.alfresco.rest.api.Categories;
-import org.alfresco.rest.api.model.Category;
-import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
-import org.alfresco.rest.framework.resource.parameters.Paging;
-import org.alfresco.rest.framework.resource.parameters.Parameters;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class SubcategoriesRelationTest
-{
-    private static final String PARENT_CATEGORY_ID = "parent-category-node-id";
-    private static final String CATEGORY_ID = "category-node-id";
-    private static final String CATEGORY_NAME = "categoryName";
-    private static final String SUBCATEGORY_NAME_PREFIX = "childCategoryName";
-
-    @Mock
-    private Categories categoriesMock;
-    @Mock
-    private Parameters parametersMock;
-
-    @InjectMocks
-    private SubcategoriesRelation objectUnderTest;
-
-    @Test
-    public void testCreateSubcategory()
-    {
-        final Category categoryToCreate = Category.builder().name(CATEGORY_NAME).create();
-        final Category category = Category.builder().name(CATEGORY_NAME).parentId(PARENT_CATEGORY_ID).hasChildren(false).id(CATEGORY_ID).create();
-        final List<Category> categoriesToCreate = List.of(categoryToCreate);
-        given(categoriesMock.createSubcategories(PARENT_CATEGORY_ID, categoriesToCreate, parametersMock)).willReturn(List.of(category));
-
-        //when
-        List<Category> categories = objectUnderTest.create(PARENT_CATEGORY_ID, categoriesToCreate, parametersMock);
-
-        then(categoriesMock).should().createSubcategories(PARENT_CATEGORY_ID, categoriesToCreate, parametersMock);
-        then(categoriesMock).shouldHaveNoMoreInteractions();
-        assertEquals(List.of(category), categories);
-    }
-
-    @Test
-    public void testGetCategoryChildren() {
-        final CollectionWithPagingInfo<Category> categoryChildren = getCategories(3);
-        given(categoriesMock.getCategoryChildren(PARENT_CATEGORY_ID, parametersMock)).willReturn(categoryChildren);
-
-        //when
-        final CollectionWithPagingInfo<Category> returnedChildren = objectUnderTest.readAll(PARENT_CATEGORY_ID, parametersMock);
-
-        then(categoriesMock).should().getCategoryChildren(PARENT_CATEGORY_ID, parametersMock);
-        then(categoriesMock).shouldHaveNoMoreInteractions();
-        assertEquals(categoryChildren, returnedChildren);
-    }
-
-    private CollectionWithPagingInfo<Category> getCategories(final int count)
-    {
-        return CollectionWithPagingInfo.asPaged(Paging.DEFAULT,
-                IntStream.range(0, count)
-                        .mapToObj(i -> Category.builder().name(SUBCATEGORY_NAME_PREFIX + "-" + i)
-                            .parentId(PARENT_CATEGORY_ID)
-                            .hasChildren(false)
-                            .id(CATEGORY_ID + "-" + i)
-                            .create())
-                        .collect(Collectors.toList())
-        );
-    }
-}

remote-api/src/test/java/org/alfresco/rest/api/impl/CategoriesImplTest.java

@@ -26,27 +26,15 @@
 
 package org.alfresco.rest.api.impl;
 
-import static org.alfresco.rest.api.Nodes.PATH_ROOT;
-import static org.alfresco.rest.api.impl.CategoriesImpl.NOT_A_VALID_CATEGORY;
-import static org.alfresco.rest.api.impl.CategoriesImpl.NOT_NULL_OR_EMPTY;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.rest.api.Nodes;
@@ -54,18 +42,12 @@ import org.alfresco.rest.api.model.Category;
 import org.alfresco.rest.api.model.Node;
 import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
-import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
-import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 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.cmr.search.CategoryService;
-import org.alfresco.service.cmr.security.AuthorityService;
-import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -79,8 +61,6 @@ public class CategoriesImplTest
     private static final String CATEGORY_NAME = "categoryName";
     private static final String PARENT_ID = "parent-node-id";
     private static final String CAT_ROOT_NODE_ID = "cat-root-node-id";
-    private static final NodeRef CATEGORY_NODE_REF = createNodeRefWithId(CATEGORY_ID);
-    private static final Category CATEGORY = createDefaultCategoryWithName(CATEGORY_NAME);
 
     @Mock
     private Nodes nodesMock;
@@ -89,10 +69,6 @@ public class CategoriesImplTest
     @Mock
     private Parameters parametersMock;
     @Mock
-    private AuthorityService authorityServiceMock;
-    @Mock
-    private CategoryService categoryServiceMock;
-    @Mock
     private ChildAssociationRef dummyChildAssociationRefMock;
     @Mock
     private ChildAssociationRef categoryChildAssociationRefMock;
@@ -100,19 +76,12 @@ public class CategoriesImplTest
     @InjectMocks
     private CategoriesImpl objectUnderTest;
 
-    @Before
-    public void setUp() throws Exception
-    {
-        given(authorityServiceMock.hasAdminAuthority()).willReturn(true);
-        given(nodesMock.validateNode(eq(CATEGORY_ID))).willReturn(CATEGORY_NODE_REF);
-        given(nodesMock.isSubClass(any(), any(), anyBoolean())).willReturn(true);
-    }
-
     @Test
     public void shouldNotGetRootCategoryById()
     {
         final NodeRef categoryRootNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CAT_ROOT_NODE_ID);
         given(nodesMock.validateNode(CAT_ROOT_NODE_ID)).willReturn(categoryRootNodeRef);
+        given(nodesMock.isSubClass(categoryRootNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true);
         given(categoryChildAssociationRefMock.getQName()).willReturn(ContentModel.ASPECT_GEN_CLASSIFIABLE);
         given(nodeServiceMock.getParentAssocs(categoryRootNodeRef)).willReturn(List.of(categoryChildAssociationRefMock));
 
@@ -124,8 +93,6 @@ public class CategoriesImplTest
         then(nodesMock).shouldHaveNoMoreInteractions();
         then(nodeServiceMock).should().getParentAssocs(categoryRootNodeRef);
         then(nodeServiceMock).shouldHaveNoMoreInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-        then(authorityServiceMock).shouldHaveNoInteractions();
     }
 
     @Test
@@ -133,6 +100,7 @@ public class CategoriesImplTest
     {
         final NodeRef categoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CATEGORY_ID);
         given(nodesMock.validateNode(CATEGORY_ID)).willReturn(categoryNodeRef);
+        given(nodesMock.isSubClass(categoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true);
         final Node categoryNode = new Node();
         categoryNode.setName(CATEGORY_NAME);
         categoryNode.setNodeId(CATEGORY_ID);
@@ -158,16 +126,10 @@ public class CategoriesImplTest
         then(nodeServiceMock).should().getChildAssocs(categoryNodeRef, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
         then(nodeServiceMock).shouldHaveNoMoreInteractions();
 
-        then(categoryServiceMock).shouldHaveNoInteractions();
-        then(authorityServiceMock).shouldHaveNoInteractions();
-
-        final Category expectedCategory = Category.builder()
-                .id(CATEGORY_ID)
-                .name(categoryNode.getName())
-                .hasChildren(true)
-                .parentId(PARENT_ID)
-                .create();
-        assertEquals(expectedCategory, category);
+        assertEquals(categoryNode.getName(), category.getName());
+        assertEquals(CATEGORY_ID, category.getId());
+        assertEquals(PARENT_ID, category.getParentId());
+        assertTrue(category.getHasChildren());
     }
 
     @Test
@@ -175,6 +137,7 @@ public class CategoriesImplTest
     {
         final NodeRef categoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CATEGORY_ID);
         given(nodesMock.validateNode(CATEGORY_ID)).willReturn(categoryNodeRef);
+        given(nodesMock.isSubClass(categoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true);
         final Node categoryNode = new Node();
         categoryNode.setName(CATEGORY_NAME);
         categoryNode.setNodeId(CATEGORY_ID);
@@ -199,16 +162,10 @@ public class CategoriesImplTest
         then(nodeServiceMock).should().getChildAssocs(categoryNodeRef, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
         then(nodeServiceMock).shouldHaveNoMoreInteractions();
 
-        then(categoryServiceMock).shouldHaveNoInteractions();
-        then(authorityServiceMock).shouldHaveNoInteractions();
-
-        final Category expectedCategory = Category.builder()
-                .id(CATEGORY_ID)
-                .name(categoryNode.getName())
-                .hasChildren(false)
-                .parentId(PARENT_ID)
-                .create();
-        assertEquals(expectedCategory, category);
+        assertEquals(categoryNode.getName(), category.getName());
+        assertEquals(CATEGORY_ID, category.getId());
+        assertEquals(PARENT_ID, category.getParentId());
+        assertFalse(category.getHasChildren());
     }
 
     @Test
@@ -226,8 +183,6 @@ public class CategoriesImplTest
         then(nodesMock).shouldHaveNoMoreInteractions();
 
         then(nodeServiceMock).shouldHaveNoInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-        then(authorityServiceMock).shouldHaveNoInteractions();
     }
 
     @Test
@@ -242,627 +197,5 @@ public class CategoriesImplTest
         then(nodesMock).shouldHaveNoMoreInteractions();
 
         then(nodeServiceMock).shouldHaveNoInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-        then(authorityServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testDeleteCategoryById_asAdmin()
-    {
-        given(authorityServiceMock.hasAdminAuthority()).willReturn(true);
-        final NodeRef categoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CATEGORY_ID);
-        given(nodesMock.validateNode(CATEGORY_ID)).willReturn(categoryNodeRef);
-        given(nodesMock.isSubClass(categoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true);
-        final Node categoryNode = new Node();
-        categoryNode.setName(CATEGORY_NAME);
-        categoryNode.setNodeId(CATEGORY_ID);
-        final NodeRef parentNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID);
-        categoryNode.setParentId(parentNodeRef);
-
-        //when
-        objectUnderTest.deleteCategoryById(CATEGORY_ID, parametersMock);
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-        then(nodesMock).should().validateNode(CATEGORY_ID);
-
-        then(nodesMock).should().isSubClass(categoryNodeRef, ContentModel.TYPE_CATEGORY, false);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-
-        then(nodeServiceMock).should().getParentAssocs(categoryNodeRef);
-        then(nodeServiceMock).should().deleteNode(categoryNodeRef);
-        then(nodeServiceMock).shouldHaveNoMoreInteractions();
-    }
-
-    @Test
-    public void testDeleteCategoryById_asNonAdminUser()
-    {
-        given(authorityServiceMock.hasAdminAuthority()).willReturn(false);
-
-        //when
-        assertThrows(PermissionDeniedException.class, () -> objectUnderTest.deleteCategoryById(CATEGORY_ID, parametersMock));
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-
-        then(nodesMock).shouldHaveNoInteractions();
-        then(nodeServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testDeleteCategoryById_nonCategoryId()
-    {
-        given(authorityServiceMock.hasAdminAuthority()).willReturn(true);
-        final NodeRef categoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CATEGORY_ID);
-        given(nodesMock.validateNode(CATEGORY_ID)).willReturn(categoryNodeRef);
-        given(nodesMock.isSubClass(categoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(false);
-
-        //when
-        assertThrows(InvalidArgumentException.class, () -> objectUnderTest.deleteCategoryById(CATEGORY_ID, parametersMock));
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-
-        then(nodesMock).should().validateNode(CATEGORY_ID);
-        then(nodesMock).should().isSubClass(categoryNodeRef, ContentModel.TYPE_CATEGORY, false);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-    }
-
-    @Test
-    public void testDeleteCategoryById_rootCategory()
-    {
-        given(authorityServiceMock.hasAdminAuthority()).willReturn(true);
-        final NodeRef categoryRootNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CAT_ROOT_NODE_ID);
-        given(nodesMock.validateNode(CAT_ROOT_NODE_ID)).willReturn(categoryRootNodeRef);
-        given(nodesMock.isSubClass(categoryRootNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true);
-        given(categoryChildAssociationRefMock.getQName()).willReturn(ContentModel.ASPECT_GEN_CLASSIFIABLE);
-        given(nodeServiceMock.getParentAssocs(categoryRootNodeRef)).willReturn(List.of(categoryChildAssociationRefMock));
-
-        //when
-        assertThrows(InvalidArgumentException.class, () -> objectUnderTest.deleteCategoryById(CAT_ROOT_NODE_ID, parametersMock));
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-
-        then(nodesMock).should().validateNode(CAT_ROOT_NODE_ID);
-        then(nodesMock).should().isSubClass(categoryRootNodeRef, ContentModel.TYPE_CATEGORY, false);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-
-        then(nodeServiceMock).should().getParentAssocs(categoryRootNodeRef);
-        then(nodeServiceMock).shouldHaveNoMoreInteractions();
-    }
-
-    @Test
-    public void testCreateCategoryUnderRoot()
-    {
-        final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PATH_ROOT);
-        given(categoryServiceMock.getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE))
-                .willReturn(Optional.of(parentCategoryNodeRef));
-        final NodeRef categoryNodeRef = createNodeRefWithId(CATEGORY_ID);
-        given(categoryServiceMock.createCategory(parentCategoryNodeRef, CATEGORY_NAME)).willReturn(categoryNodeRef);
-        given(nodesMock.getNode(CATEGORY_ID)).willReturn(prepareCategoryNode());
-        final ChildAssociationRef parentAssoc = new ChildAssociationRef(null, parentCategoryNodeRef, null, categoryNodeRef);
-        given(nodeServiceMock.getPrimaryParent(categoryNodeRef)).willReturn(parentAssoc);
-        given(nodeServiceMock.getParentAssocs(parentCategoryNodeRef)).willReturn(List.of(parentAssoc));
-        given(nodeServiceMock.getChildAssocs(categoryNodeRef, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false))
-                .willReturn(Collections.emptyList());
-
-        //when
-        final List<Category> createdCategories = objectUnderTest.createSubcategories(PATH_ROOT, prepareCategories(), parametersMock);
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-        then(nodesMock).should().getNode(CATEGORY_ID);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-        then(nodeServiceMock).should().getPrimaryParent(categoryNodeRef);
-        then(nodeServiceMock).should().getParentAssocs(parentCategoryNodeRef);
-        then(nodeServiceMock).should().getChildAssocs(categoryNodeRef, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
-        then(nodeServiceMock).shouldHaveNoMoreInteractions();
-        then(categoryServiceMock).should().getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
-        then(categoryServiceMock).should().createCategory(parentCategoryNodeRef, CATEGORY_NAME);
-        then(categoryServiceMock).shouldHaveNoMoreInteractions();
-
-        assertEquals(1, createdCategories.size());
-        final Category expectedCategory = Category.builder()
-                .id(CATEGORY_ID)
-                .name(CATEGORY_NAME)
-                .hasChildren(false)
-                .parentId(PATH_ROOT)
-                .create();
-        final Category createdCategory = createdCategories.iterator().next();
-        assertEquals(expectedCategory, createdCategory);
-    }
-
-    @Test
-    public void testCreateCategory()
-    {
-        final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID);
-        given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef);
-        final NodeRef categoryNodeRef = createNodeRefWithId(CATEGORY_ID);
-        given(categoryServiceMock.createCategory(parentCategoryNodeRef, CATEGORY_NAME)).willReturn(categoryNodeRef);
-        given(nodesMock.getNode(CATEGORY_ID)).willReturn(prepareCategoryNode());
-        final ChildAssociationRef parentAssoc = new ChildAssociationRef(null, parentCategoryNodeRef, null, categoryNodeRef);
-        given(nodeServiceMock.getPrimaryParent(categoryNodeRef)).willReturn(parentAssoc);
-        given(nodeServiceMock.getParentAssocs(parentCategoryNodeRef)).willReturn(List.of(parentAssoc));
-        given(nodeServiceMock.getChildAssocs(categoryNodeRef, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false))
-                .willReturn(Collections.emptyList());
-
-        //when
-        final List<Category> createdCategories = objectUnderTest.createSubcategories(PARENT_ID, prepareCategories(), parametersMock);
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-        then(nodesMock).should().validateNode(PARENT_ID);
-        then(nodesMock).should().isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false);
-        then(nodesMock).should().getNode(CATEGORY_ID);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-        then(nodeServiceMock).should().getPrimaryParent(categoryNodeRef);
-        then(nodeServiceMock).should().getParentAssocs(parentCategoryNodeRef);
-        then(nodeServiceMock).should().getChildAssocs(categoryNodeRef, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
-        then(nodeServiceMock).shouldHaveNoMoreInteractions();
-        then(categoryServiceMock).should().createCategory(parentCategoryNodeRef, CATEGORY_NAME);
-        then(categoryServiceMock).shouldHaveNoMoreInteractions();
-
-        assertEquals(1, createdCategories.size());
-        final Category expectedCategory = Category.builder()
-                .id(CATEGORY_ID)
-                .name(CATEGORY_NAME)
-                .hasChildren(false)
-                .parentId(PARENT_ID)
-                .create();
-        final Category createdCategory = createdCategories.iterator().next();
-        assertEquals(expectedCategory, createdCategory);
-    }
-
-    @Test
-    public void testCreateCategories_noPermissions()
-    {
-        given(authorityServiceMock.hasAdminAuthority()).willReturn(false);
-
-        //when
-        assertThrows(PermissionDeniedException.class,
-                () -> objectUnderTest.createSubcategories(PARENT_ID, prepareCategories(), parametersMock));
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-        then(nodesMock).shouldHaveNoInteractions();
-        then(nodeServiceMock).shouldHaveNoInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testCreateCategories_wrongParentNodeType()
-    {
-        final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID);
-        given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef);
-        given(nodesMock.isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(false);
-
-        //when
-        assertThrows(InvalidArgumentException.class,
-                () -> objectUnderTest.createSubcategories(PARENT_ID, prepareCategories(), parametersMock));
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-        then(nodesMock).should().validateNode(PARENT_ID);
-        then(nodesMock).should().isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-        then(nodeServiceMock).shouldHaveNoInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testCreateCategories_nonExistingParentNode()
-    {
-        given(nodesMock.validateNode(PARENT_ID)).willThrow(EntityNotFoundException.class);
-
-        //when
-        assertThrows(EntityNotFoundException.class,
-                () -> objectUnderTest.createSubcategories(PARENT_ID, prepareCategories(), parametersMock));
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-        then(nodesMock).should().validateNode(PARENT_ID);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-        then(nodeServiceMock).shouldHaveNoInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testGetRootCategoryChildren()
-    {
-        final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PATH_ROOT);
-        given(categoryServiceMock.getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE))
-                .willReturn(Optional.of(parentCategoryNodeRef));
-        final int childrenCount = 3;
-        final List<ChildAssociationRef> childAssociationRefMocks = prepareChildAssocMocks(childrenCount, parentCategoryNodeRef);
-        given(nodeServiceMock.getChildAssocs(parentCategoryNodeRef)).willReturn(childAssociationRefMocks);
-        childAssociationRefMocks.forEach(this::prepareCategoryNodeMocks);
-
-        //when
-        final CollectionWithPagingInfo<Category> categoryChildren = objectUnderTest.getCategoryChildren(PATH_ROOT, parametersMock);
-
-        then(categoryServiceMock).should().getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
-        then(categoryServiceMock).shouldHaveNoMoreInteractions();
-        then(nodeServiceMock).should().getChildAssocs(parentCategoryNodeRef);
-        childAssociationRefMocks.forEach(ca -> {
-            then(nodesMock).should().getNode(ca.getChildRef().getId());
-            then(nodeServiceMock).should()
-                    .getChildAssocs(ca.getChildRef(), RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
-            then(nodeServiceMock).should().getPrimaryParent(ca.getChildRef());
-        });
-        then(nodeServiceMock).should(times(childrenCount)).getParentAssocs(parentCategoryNodeRef);
-
-        then(nodesMock).shouldHaveNoMoreInteractions();
-        then(nodeServiceMock).shouldHaveNoMoreInteractions();
-
-        then(authorityServiceMock).shouldHaveNoInteractions();
-
-        assertEquals(childAssociationRefMocks.size(), categoryChildren.getTotalItems().intValue());
-        final List<Category> categoryChildrenList = new ArrayList<>(categoryChildren.getCollection());
-        assertEquals(childAssociationRefMocks.size(), categoryChildrenList.size());
-        IntStream.range(0, childrenCount).forEach(i -> doCategoryAssertions(categoryChildrenList.get(i), i, PATH_ROOT));
-    }
-
-    @Test
-    public void testGetCategoryChildren()
-    {
-        final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID);
-        given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef);
-        given(nodesMock.isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true);
-        final int childrenCount = 3;
-        final List<ChildAssociationRef> childAssociationRefMocks = prepareChildAssocMocks(childrenCount, parentCategoryNodeRef);
-        given(nodeServiceMock.getChildAssocs(parentCategoryNodeRef)).willReturn(childAssociationRefMocks);
-        childAssociationRefMocks.forEach(this::prepareCategoryNodeMocks);
-
-        //when
-        final CollectionWithPagingInfo<Category> categoryChildren = objectUnderTest.getCategoryChildren(PARENT_ID, parametersMock);
-
-        then(nodesMock).should().validateNode(PARENT_ID);
-        then(nodesMock).should().isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false);
-        then(nodeServiceMock).should().getChildAssocs(parentCategoryNodeRef);
-        childAssociationRefMocks.forEach(ca -> {
-            then(nodesMock).should().getNode(ca.getChildRef().getId());
-            then(nodeServiceMock).should()
-                    .getChildAssocs(ca.getChildRef(), RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
-            then(nodeServiceMock).should().getPrimaryParent(ca.getChildRef());
-        });
-        then(nodeServiceMock).should(times(childrenCount)).getParentAssocs(parentCategoryNodeRef);
-
-        then(nodesMock).shouldHaveNoMoreInteractions();
-        then(nodeServiceMock).shouldHaveNoMoreInteractions();
-
-        then(authorityServiceMock).shouldHaveNoInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-
-        assertEquals(childAssociationRefMocks.size(), categoryChildren.getTotalItems().intValue());
-        final List<Category> categoryChildrenList = new ArrayList<>(categoryChildren.getCollection());
-        assertEquals(childAssociationRefMocks.size(), categoryChildrenList.size());
-        IntStream.range(0, childrenCount).forEach(i -> doCategoryAssertions(categoryChildrenList.get(i), i, PARENT_ID));
-    }
-
-    @Test
-    public void testGetCategoryChildren_noChildren()
-    {
-        final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID);
-        given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef);
-        given(nodesMock.isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true);
-
-        given(nodeServiceMock.getChildAssocs(parentCategoryNodeRef)).willReturn(Collections.emptyList());
-
-
-        //when
-        final CollectionWithPagingInfo<Category> categoryChildren = objectUnderTest.getCategoryChildren(PARENT_ID, parametersMock);
-
-        then(nodesMock).should().validateNode(PARENT_ID);
-        then(nodesMock).should().isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-        then(nodeServiceMock).should().getChildAssocs(parentCategoryNodeRef);
-        then(nodeServiceMock).shouldHaveNoMoreInteractions();
-
-        then(authorityServiceMock).shouldHaveNoInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-
-        assertEquals(0, categoryChildren.getTotalItems().intValue());
-    }
-
-    @Test
-    public void testGetCategoryChildren_wrongParentNodeType()
-    {
-        final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID);
-        given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef);
-        given(nodesMock.isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(false);
-
-        //when
-        assertThrows(InvalidArgumentException.class, () -> objectUnderTest.getCategoryChildren(PARENT_ID, parametersMock));
-
-        then(nodesMock).should().validateNode(PARENT_ID);
-        then(nodesMock).should().isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-
-        then(nodeServiceMock).shouldHaveNoInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-        then(authorityServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testGetCategoryChildren_nonExistingParentNode()
-    {
-        given(nodesMock.validateNode(PARENT_ID)).willThrow(EntityNotFoundException.class);
-
-        //when
-        assertThrows(EntityNotFoundException.class, () -> objectUnderTest.getCategoryChildren(PARENT_ID, parametersMock));
-
-
-        then(nodesMock).should().validateNode(PARENT_ID);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-
-        then(nodeServiceMock).shouldHaveNoInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-        then(authorityServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testUpdateCategoryById()
-    {
-        final String categoryNewName = "categoryNewName";
-        final Category fixedCategory = createCategoryOnlyWithName(categoryNewName);
-        final QName categoryQName = createCmQNameOf(CATEGORY_NAME);
-        final NodeRef parentCategoryNodeRef = createNodeRefWithId(PARENT_ID);
-        final ChildAssociationRef parentAssociation = createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, categoryQName);
-        given(nodesMock.getNode(any())).willReturn(prepareCategoryNode(categoryNewName));
-        given(nodeServiceMock.getPrimaryParent(any())).willReturn(parentAssociation);
-        given(nodeServiceMock.moveNode(any(), any(), any(), any())).willReturn(createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, createCmQNameOf(categoryNewName)));
-
-        // when
-        final Category actualCategory = objectUnderTest.updateCategoryById(CATEGORY_ID, fixedCategory);
-
-        then(authorityServiceMock).should().hasAdminAuthority();
-        then(authorityServiceMock).shouldHaveNoMoreInteractions();
-        then(nodesMock).should().validateNode(CATEGORY_ID);
-        then(nodesMock).should().isSubClass(CATEGORY_NODE_REF, ContentModel.TYPE_CATEGORY, false);
-        then(nodesMock).should().getNode(CATEGORY_ID);
-        then(nodesMock).shouldHaveNoMoreInteractions();
-        then(nodeServiceMock).should().getParentAssocs(CATEGORY_NODE_REF);
-        then(nodeServiceMock).should().getChildAssocs(CATEGORY_NODE_REF, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
-        then(nodeServiceMock).should().setProperty(CATEGORY_NODE_REF, ContentModel.PROP_NAME, categoryNewName);
-        then(nodeServiceMock).should(times(2)).getPrimaryParent(CATEGORY_NODE_REF);
-        final QName expectedNewQName = createCmQNameOf(categoryNewName);
-        then(nodeServiceMock).should().moveNode(CATEGORY_NODE_REF, parentCategoryNodeRef, ContentModel.ASSOC_SUBCATEGORIES, expectedNewQName);
-        then(nodeServiceMock).should().getParentAssocs(parentCategoryNodeRef);
-        then(nodeServiceMock).shouldHaveNoMoreInteractions();
-        then(categoryServiceMock).shouldHaveNoInteractions();
-        final Category expectedCategory = createDefaultCategoryWithName(categoryNewName);
-        assertThat(actualCategory)
-            .isNotNull().usingRecursiveComparison()
-            .isEqualTo(expectedCategory);
-    }
-
-    @Test
-    public void testUpdateCategoryById_noPermission()
-    {
-        given(authorityServiceMock.hasAdminAuthority()).willReturn(false);
-
-        // when
-        assertThatExceptionOfType(PermissionDeniedException.class).isThrownBy(() -> objectUnderTest.updateCategoryById(CATEGORY_ID, CATEGORY));
-
-        then(nodesMock).shouldHaveNoInteractions();
-        then(nodeServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testUpdateCategoryById_categoryNodeNotFound()
-    {
-        given(nodesMock.validateNode(any(String.class))).willThrow(EntityNotFoundException.class);
-
-        // when
-        assertThatExceptionOfType(EntityNotFoundException.class).isThrownBy(() -> objectUnderTest.updateCategoryById(CATEGORY_ID, CATEGORY));
-
-        then(nodeServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testUpdateCategoryById_notACategory()
-    {
-        given(nodesMock.isSubClass(any(), any(), eq(false))).willReturn(false);
-
-        // when
-        assertThatExceptionOfType(InvalidArgumentException.class).isThrownBy(() -> objectUnderTest.updateCategoryById(CATEGORY_ID, CATEGORY))
-            .withMessageContaining(NOT_A_VALID_CATEGORY);
-
-        then(nodeServiceMock).shouldHaveNoInteractions();
-    }
-
-    @Test
-    public void testUpdateCategoryById_isRootCategory()
-    {
-        given(categoryServiceMock.getRootCategoryNodeRef(any())).willReturn(Optional.of(createNodeRefWithId(PATH_ROOT)));
-        given(nodeServiceMock.getParentAssocs(any())).willReturn(List.of(categoryChildAssociationRefMock));
-        given(categoryChildAssociationRefMock.getQName()).willReturn(ContentModel.ASPECT_GEN_CLASSIFIABLE);
-
-        // when
-        assertThatExceptionOfType(InvalidArgumentException.class).isThrownBy(() -> objectUnderTest.updateCategoryById(PATH_ROOT, CATEGORY))
-            .withMessageContaining(NOT_A_VALID_CATEGORY);
-
-        then(categoryServiceMock).should().getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
-        then(categoryServiceMock).shouldHaveNoMoreInteractions();
-    }
-
-    private List<String> getInvalidCategoryNames()
-    {
-        final List<String> invalidNames = new ArrayList<>();
-        invalidNames.add(null);
-        invalidNames.add("");
-        return invalidNames;
-    }
-
-    @Test
-    public void testUpdateCategoryById_emptyName()
-    {
-        for (String invalidName : getInvalidCategoryNames())
-        {
-            final Category categoryWithoutName = createCategoryOnlyWithName(invalidName);
-
-            // when
-            assertThatExceptionOfType(InvalidArgumentException.class).isThrownBy(() -> objectUnderTest.updateCategoryById(CATEGORY_ID, categoryWithoutName))
-                .withMessageContaining(NOT_NULL_OR_EMPTY);
-        }
-    }
-
-    @Test
-    public void testUpdateCategoryById_notMatchingIdField()
-    {
-        final String categoryNewName = "categoryNewName";
-        final Category categoryWithInvalidId = createCategoryOnlyWithName(categoryNewName);
-        categoryWithInvalidId.setId("different-" + CATEGORY_ID);
-        final QName categoryQName = createCmQNameOf(CATEGORY_NAME);
-        final NodeRef parentCategoryNodeRef = createNodeRefWithId(PARENT_ID);
-        final ChildAssociationRef parentAssociation = createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, categoryQName);
-        given(nodesMock.getNode(any())).willReturn(prepareCategoryNode(categoryNewName));
-        given(nodeServiceMock.getPrimaryParent(any())).willReturn(parentAssociation);
-        given(nodeServiceMock.moveNode(any(), any(), any(), any())).willReturn(createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, createCmQNameOf(categoryNewName)));
-
-        // when
-        final Category actualCategory = objectUnderTest.updateCategoryById(CATEGORY_ID, categoryWithInvalidId);
-
-        final Category expectedCategory = createDefaultCategoryWithName(categoryNewName);
-        assertThat(actualCategory)
-            .isNotNull().usingRecursiveComparison()
-            .isEqualTo(expectedCategory);
-    }
-
-    @Test
-    public void testUpdateCategoryById_notMatchingParentIdField()
-    {
-        final String categoryNewName = "categoryNewName";
-        final Category categoryWithInvalidParentId = createCategoryOnlyWithName(categoryNewName);
-        categoryWithInvalidParentId.setParentId("different-" + PARENT_ID);
-        final QName categoryQName = createCmQNameOf(CATEGORY_NAME);
-        final NodeRef parentCategoryNodeRef = createNodeRefWithId(PARENT_ID);
-        final ChildAssociationRef parentAssociation = createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, categoryQName);
-        given(nodesMock.getNode(any())).willReturn(prepareCategoryNode(categoryNewName));
-        given(nodeServiceMock.getPrimaryParent(any())).willReturn(parentAssociation);
-        given(nodeServiceMock.moveNode(any(), any(), any(), any())).willReturn(createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, createCmQNameOf(categoryNewName)));
-
-        // when
-        final Category actualCategory = objectUnderTest.updateCategoryById(CATEGORY_ID, categoryWithInvalidParentId);
-
-        final Category expectedCategory = createDefaultCategoryWithName(categoryNewName);
-        assertThat(actualCategory)
-            .isNotNull().usingRecursiveComparison()
-            .isEqualTo(expectedCategory);
-    }
-
-    @Test
-    public void testUpdateCategoryById_notMatchingHasChildrenField()
-    {
-        final String categoryNewName = "categoryNewName";
-        final Category categoryWithInvalidHasChildren = createCategoryOnlyWithName(categoryNewName);
-        categoryWithInvalidHasChildren.setHasChildren(true);
-        final QName categoryQName = createCmQNameOf(CATEGORY_NAME);
-        final NodeRef parentCategoryNodeRef = createNodeRefWithId(PARENT_ID);
-        final ChildAssociationRef parentAssociation = createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, categoryQName);
-        given(nodesMock.getNode(any())).willReturn(prepareCategoryNode(categoryNewName));
-        given(nodeServiceMock.getPrimaryParent(any())).willReturn(parentAssociation);
-        given(nodeServiceMock.moveNode(any(), any(), any(), any())).willReturn(createAssociationOf(parentCategoryNodeRef, CATEGORY_NODE_REF, createCmQNameOf(categoryNewName)));
-
-        // when
-        final Category actualCategory = objectUnderTest.updateCategoryById(CATEGORY_ID, categoryWithInvalidHasChildren);
-
-        final Category expectedCategory = createDefaultCategoryWithName(categoryNewName);
-        assertThat(actualCategory)
-            .isNotNull().usingRecursiveComparison()
-            .isEqualTo(expectedCategory);
-    }
-
-    private Node prepareCategoryNode(final String name, final String id, final NodeRef parentNodeRef)
-    {
-        final Node categoryNode = new Node();
-        categoryNode.setName(name);
-        categoryNode.setNodeId(id);
-        categoryNode.setParentId(parentNodeRef);
-        return categoryNode;
-    }
-
-    private Node prepareCategoryNode(final String name)
-    {
-        final NodeRef parentNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID);
-        return prepareCategoryNode(name, CATEGORY_ID, parentNodeRef);
-    }
-
-    private Node prepareCategoryNode()
-    {
-        return prepareCategoryNode(CATEGORY_NAME);
-    }
-
-    private List<Category> prepareCategories()
-    {
-        return List.of(Category.builder()
-                .name(CATEGORY_NAME)
-                .create());
-    }
-
-    private List<ChildAssociationRef> prepareChildAssocMocks(final int count, NodeRef parentCategoryNodeRef)
-    {
-        return IntStream.range(0, count).mapToObj(i -> {
-            ChildAssociationRef dummyChildAssocMock = mock(ChildAssociationRef.class);
-            given(dummyChildAssocMock.getTypeQName()).willReturn(ContentModel.ASSOC_SUBCATEGORIES);
-            given(dummyChildAssocMock.getChildRef())
-                    .willReturn(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CATEGORY_ID + "-" + i));
-            given(dummyChildAssocMock.getParentRef()).willReturn(parentCategoryNodeRef);
-            return dummyChildAssocMock;
-        }).collect(Collectors.toList());
-    }
-
-    private void prepareCategoryNodeMocks(ChildAssociationRef childAssociationRef)
-    {
-        final NodeRef childRef = childAssociationRef.getChildRef();
-        final String id = childRef.getId();
-        final String name = id.replace(CATEGORY_ID, CATEGORY_NAME);
-        final NodeRef parentRef = childAssociationRef.getParentRef();
-        given(nodesMock.getNode(id)).willReturn(prepareCategoryNode(name, id, parentRef));
-        final ChildAssociationRef parentAssoc = new ChildAssociationRef(null, parentRef, null, childRef);
-        given(nodeServiceMock.getPrimaryParent(childRef)).willReturn(parentAssoc);
-        given(nodeServiceMock.getParentAssocs(parentRef)).willReturn(List.of(parentAssoc));
-    }
-
-    private void doCategoryAssertions(final Category category, final int index, final String parentId)
-    {
-        final Category expectedCategory = Category.builder()
-                .id(CATEGORY_ID + "-" + index)
-                .name(CATEGORY_NAME + "-" + index)
-                .parentId(parentId)
-                .hasChildren(false)
-                .create();
-        assertEquals(expectedCategory, category);
-    }
-
-    private static NodeRef createNodeRefWithId(final String id)
-    {
-        return new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id);
-    }
-
-    private static Category createCategoryOnlyWithName(final String name)
-    {
-        return Category.builder().name(name).create();
-    }
-
-    private static Category createDefaultCategoryWithName(final String name)
-    {
-        return Category.builder()
-            .id(CATEGORY_ID)
-            .name(name)
-            .parentId(PARENT_ID)
-            .hasChildren(false)
-            .create();
-    }
-
-    private static QName createCmQNameOf(final String name)
-    {
-        return QName.createQName(ContentModel.TYPE_CATEGORY.getNamespaceURI(), QName.createValidLocalName(name));
-    }
-
-    private static ChildAssociationRef createAssociationOf(final NodeRef parentNode, final NodeRef childNode, final QName childNodeName)
-    {
-        return new ChildAssociationRef(ContentModel.ASSOC_SUBCATEGORIES, parentNode, childNodeName, childNode);
     }
 }

remote-api/src/test/resources/log4j.properties

@@ -0,0 +1,25 @@
+log4j.rootLogger=error, Console
+
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
+
+log4j.logger.org.alfresco=WARN
+log4j.logger.org.alfresco.rest.api=DEBUG
+log4j.logger.org.eclipse.jetty.util.log=INFO
+
+# Renditions and Transforms
+log4j.logger.org.alfresco.repo.content.transform.TransformerDebug=debug
+
+log4j.logger.org.alfresco.repo.rendition2=debug
+#log4j.logger.org.alfresco.repo.rendition2.LocalTransformClient=debug
+#log4j.logger.org.alfresco.repo.rendition.RenditionServiceImpl=debug
+#log4j.logger.org.alfresco.enterprise.repo.rendition2.RemoteTransformClient=debug
+log4j.logger.org.alfresco.repo.thumbnail.ThumbnailServiceImplTest=DEBUG
+log4j.logger.org.alfresco.repo.rendition2.RenditionService2Impl=DEBUG
+
+#log4j.logger.org.alfresco.repo.content.transform.LocalTransformServiceRegistry=debug
+#log4j.logger.org.alfresco.enterprise.repo.rendition2.RemoteTransformServiceRegistry=debug
+#log4j.logger.org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl=debug
+#log4j.logger.org.alfresco.repo.content.MimetypeMap=debug
+#log4j.logger.org.alfresco.repo.content.transform.LocalTransform=trace

remote-api/src/test/resources/log4j2.properties

@@ -1,56 +0,0 @@
-# Set root logger level to error
-rootLogger.level=error
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-
-###### Console appender definition #######
-# All outputs currently set to be a ConsoleAppender.
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
-
-logger.alfresco.name=org.alfresco
-logger.alfresco.level=warn
-
-logger.alfresco-rest-api.name=org.alfresco.rest.api
-logger.alfresco-rest-api.level=debug
-
-logger.eclipse-jetty-util-log.name=org.eclipse.jetty.util.log
-logger.eclipse-jetty-util-log.level=info
-
-# Renditions and Transforms
-logger.alfresco-repo-content-transform-TransformerDebug.name=org.alfresco.repo.content.transform.TransformerDebug
-logger.alfresco-repo-content-transform-TransformerDebug.level=debug
-
-logger.alfresco-repo-rendition2.name=org.alfresco.repo.rendition2
-logger.alfresco-repo-rendition2.level=debug
-
-#logger.alfresco-repo-rendition2-LocalTransformClient.name=org.alfresco.repo.rendition2.LocalTransformClient
-#logger.alfresco-repo-rendition2-LocalTransformClient.level=debug
-
-#logger.alfresco-repo-rendition-RenditionServiceImpl.name=org.alfresco.repo.rendition.RenditionServiceImpl
-#logger.alfresco-repo-rendition-RenditionServiceImpl.level=debug
-
-#logger.alfresco-enterprise-repo-rendition2-RemoteTransformClient.name=org.alfresco.enterprise.repo.rendition2.RemoteTransformClient
-#logger.alfresco-enterprise-repo-rendition2-RemoteTransformClient.level=debug
-
-logger.alfresco-repo-thumbnail-ThumbnailServiceImplTest.name=org.alfresco.repo.thumbnail.ThumbnailServiceImplTest
-logger.alfresco-repo-thumbnail-ThumbnailServiceImplTest.level=debug
-
-logger.alfresco-repo-rendition2-RenditionService2Impl.name=org.alfresco.repo.rendition2.RenditionService2Impl
-logger.alfresco-repo-rendition2-RenditionService2Impl.level=debug
-
-#logger.alfresco-repo-content-transform-LocalTransformServiceRegistry.name=org.alfresco.repo.content.transform.LocalTransformServiceRegistry
-#logger.alfresco-repo-content-transform-LocalTransformServiceRegistry.level=debug
-
-#logger.alfresco-enterprise-repo-rendition2-RemoteTransformServiceRegistry.name=org.alfresco.enterprise.repo.rendition2.RemoteTransformServiceRegistry
-#logger.alfresco-enterprise-repo-rendition2-RemoteTransformServiceRegistry.level=debug
-
-#logger.alfresco-repo-rendition2-RenditionDefinitionRegistry2Impl.name=org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl
-#logger.alfresco-repo-rendition2-RenditionDefinitionRegistry2Impl.level=debug
-
-#logger.alfresco-repo-content-MimetypeMap.name=org.alfresco.repo.content.MimetypeMap
-#logger.alfresco-repo-content-MimetypeMap.level=debug
-
-#logger.alfresco-repo-content-transform-LocalTransform.name=org.alfresco.repo.content.transform.LocalTransform
-#logger.alfresco-repo-content-transform-LocalTransform.level=trace

repository/pom.xml

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

repository/src/main/java/org/alfresco/repo/domain/node/NodeDAO.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 
@@ -894,8 +894,6 @@ public interface NodeDAO extends NodeBulkLoader
             Serializable nodeValue,
             ChildAssocRefQueryCallback resultsCallback);
 
-    public abstract List<String> selectAssocsNotLinkedByTwoOtherAssocs(
-            Long parentNodeId);
     /**
      * Used by the re-encryptor to re-encrypt encryptable properties with a new encryption key.
      */

repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -139,8 +139,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
     private static final String SELECT_CHILD_ASSOC_OF_PARENT_BY_NAME = "alfresco.node.select_ChildAssocOfParentByName";
     private static final String SELECT_CHILD_ASSOCS_OF_PARENT_WITHOUT_PARENT_ASSOCS_OF_TYPE =
             "alfresco.node.select_ChildAssocsOfParentWithoutParentAssocsOfType";
-
-    private static final String SELECT_ASSOCS_NOT_LINKED_BY_TWO_OTHER_ASSOCS = "alfresco.node.select_AssocsNotLinkedByTwoOtherAssocs";
     private static final String SELECT_CHILD_ASSOCS_OF_PARENT_WITHOUT_NODE_ASSOCS_OF_TYPE =
             "alfresco.node.select_ChildAssocsOfParentWithoutNodeAssocsOfType";
     private static final String SELECT_PARENT_ASSOCS_OF_CHILD = "alfresco.node.select_ParentAssocsOfChild";
@@ -1417,23 +1415,11 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
         assoc.setOrdered(resultsCallback.orderResults());
 
         ChildAssocResultHandler resultHandler = new ChildAssocResultHandler(resultsCallback);
-
+        
         template.select(SELECT_CHILD_ASSOCS_OF_PARENT_WITHOUT_PARENT_ASSOCS_OF_TYPE, assoc, resultHandler);
         resultsCallback.done();
     }
 
-    public List<String> selectAssocsNotLinkedByTwoOtherAssocs(
-            Long parentNodeId)
-    {
-        ChildAssocEntity assoc = new ChildAssocEntity();
-        // Parent
-        NodeEntity parentNode = new NodeEntity();
-        parentNode.setId(parentNodeId);
-        assoc.setParentNode(parentNode);
-        // Type QName
-        return template.selectList(SELECT_ASSOCS_NOT_LINKED_BY_TWO_OTHER_ASSOCS, assoc);
-    }
-
     @Override
     public List<Node> selectChildAssocsWithoutNodeAssocsOfTypes(Long parentNodeId, Long minNodeId, Long maxNodeId, Set<QName> assocTypeQNames)
     {

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

@@ -2133,16 +2133,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
         // done
         return results;
     }
-
-    @Extend(traitAPI=NodeServiceTrait.class,extensionAPI=NodeServiceExtension.class)
-    public List<String> findAssocsNotLinkedByTwoOtherAssocs(NodeRef parent)
-    {
-        // Get the parent node
-        Pair<Long, NodeRef> nodePair = getNodePairNotNull(parent);
-        Long parentNodeId = nodePair.getFirst();
-
-        return nodeDAO.selectAssocsNotLinkedByTwoOtherAssocs(parentNodeId);
-    }
+    
     /**
      * Specific properties <b>not</b> supported by {@link #getChildAssocsByPropertyValue(NodeRef, QName, Serializable)}
      */

repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java

@@ -504,21 +504,6 @@ public class ResetPasswordServiceImpl implements ResetPasswordService
         return UrlUtil.replaceShareUrlPlaceholder(url, sysAdminParams);
     }
 
-    private String getRepoBaseUrl(String url, String propName)
-    {
-        if (url == null)
-        {
-            LOGGER.warn("The url for the property [" + propName + "] is not configured.");
-            return "";
-        }
-
-        if (url.endsWith("/"))
-        {
-            url = url.substring(0, url.length() - 1);
-        }
-        return UrlUtil.replaceRepoBaseUrlPlaceholder(url, sysAdminParams);
-    }
-
     protected String getResetPasswordEmailTemplate(ClientApp clientApp)
     {
         return clientApp.getProperty("requestResetPasswordTemplatePath");
@@ -537,27 +522,20 @@ public class ResetPasswordServiceImpl implements ResetPasswordService
         StringBuilder sb = new StringBuilder(100);
 
         String pageUrl = clientApp.getProperty("resetPasswordPageUrl");
-
-        if(!StringUtils.isEmpty(clientApp.getProperty("workspaceUrl")))
+        if (StringUtils.isEmpty(pageUrl))
         {
-            String workspaceUrlPlaceholder = clientApp.getProperty("workspaceUrl");
-            String workSpaceUrl = getRepoBaseUrl(workspaceUrlPlaceholder,"");
-            sb.append(UrlUtil.replaceWorkSpaceUrlPlaceholder(pageUrl,workSpaceUrl));
-            LOGGER.warn("Client Name is " + clientApp.getName() + " The url used is     " + sb.toString());
-            /*sb.append("?key=").append(key)
-                    .append("&id=").append(BPMEngineRegistry.createGlobalId(ActivitiConstants.ENGINE_ID, id));*/
-        }
-        else if(StringUtils.isEmpty(pageUrl)) {
-                sb.append(UrlUtil.getShareUrl(sysAdminParams));
+            sb.append(UrlUtil.getShareUrl(sysAdminParams));
 
-                LOGGER.warn("'resetPasswordPageUrl' property is not set for the client [" + clientApp.getName()
+            LOGGER.warn("'resetPasswordPageUrl' property is not set for the client [" + clientApp.getName()
                         + "]. The default base url of Share will be used [" + sb.toString() + "]");
-            } else {
-                // We pass an empty string as we know that the pageUrl is not null
-                sb.append(getUrl(pageUrl, ""));
-            }
+        }
+        else
+        {
+            // We pass an empty string as we know that the pageUrl is not null
+            sb.append(getUrl(pageUrl, ""));
+        }
 
-            sb.append("?key=").append(key)
+        sb.append("?key=").append(key)
                     .append("&id=").append(BPMEngineRegistry.createGlobalId(ActivitiConstants.ENGINE_ID, id));
 
         return sb.toString();

repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.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 
@@ -48,6 +48,7 @@ import org.alfresco.query.CannedQueryFactory;
 import org.alfresco.query.CannedQueryResults;
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
+import org.alfresco.repo.cache.AsynchronouslyRefreshedCache;
 import org.alfresco.util.cache.RefreshableCacheEvent;
 import org.alfresco.util.cache.RefreshableCacheListener;
 import org.alfresco.repo.cache.SimpleCache;
@@ -1565,11 +1566,11 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
         {
             return Collections.<String> emptySet();
         }
-        List<String> rootGroupsNames = nodeService.findAssocsNotLinkedByTwoOtherAssocs(container);
+        Collection<ChildAssociationRef> childRefs = nodeService.getChildAssocsWithoutParentAssocsOfType(container, ContentModel.ASSOC_MEMBER);
         Set<String> authorities = new TreeSet<String>();
-        for (String rootGroupName : rootGroupsNames)
+        for (ChildAssociationRef childRef : childRefs)
         {
-            addAuthorityNameIfMatches(authorities, rootGroupName, type);
+            addAuthorityNameIfMatches(authorities, childRef.getQName().getLocalName(), type);
         }
         return authorities;
     }

repository/src/main/java/org/alfresco/repo/version/NodeServiceImpl.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.version;
 
 import java.io.Serializable;
@@ -656,13 +656,13 @@ public class NodeServiceImpl implements NodeService, VersionModel
         throw new UnsupportedOperationException(MSG_UNSUPPORTED);
     }
 
-    /**
-     * Gets an association by ID.
-     * 
-     * @param id
-     *            the association id
-     * @return the association, or <code>null</code> if it does not exist
-     */
+    /**
+     * Gets an association by ID.
+     * 
+     * @param id
+     *            the association id
+     * @return the association, or <code>null</code> if it does not exist
+     */
     public AssociationRef getAssoc(Long id)
     {
         return null;
@@ -762,15 +762,7 @@ public class NodeServiceImpl implements NodeService, VersionModel
     public Collection<ChildAssociationRef> getChildAssocsWithoutParentAssocsOfType(NodeRef parent, QName assocTypeQName)
     {
         throw new UnsupportedOperationException(MSG_UNSUPPORTED);
-    }
-
-    /**
-     * @throws UnsupportedOperationException always
-     */
-    public List<String> findAssocsNotLinkedByTwoOtherAssocs(NodeRef parent)
-    {
-        throw new UnsupportedOperationException(MSG_UNSUPPORTED);
-    }
+    }        
 
     /**
      * Gets, converts and adds the intrinsic properties to the current node's properties

repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.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 
@@ -1467,11 +1467,6 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension<Node
         }
     }
 
-    @Override
-    public List<String> findAssocsNotLinkedByTwoOtherAssocs(NodeRef nodeRef){
-        return getTrait().findAssocsNotLinkedByTwoOtherAssocs(nodeRef);
-    }
-
     @Override
     public void removeAssociation(NodeRef sourceRef, NodeRef targetRef, QName assocTypeQName)
                 throws InvalidNodeRefException

repository/src/main/java/org/alfresco/util/UrlUtil.java

@@ -41,12 +41,6 @@ public class UrlUtil
     public static final Pattern PATTERN = Pattern.compile("\\$\\{shareUrl\\}");
     // ${alfrescoUrl} placeholder
     public static final Pattern REPO_PATTERN = Pattern.compile("\\$\\{alfrescoUrl\\}");
-
-    public static final Pattern REPOBASE_PATTERN = Pattern.compile("\\$\\{repoBaseUrl\\}");
-
-    public static final Pattern WORKSPACE_PATTERN = Pattern.compile("\\$\\{workspaceUrl\\}");
-
-
     /**
      * Builds up the Url to Alfresco based on the settings in the 
      *  {@link SysAdminParams}. 
@@ -152,68 +146,4 @@ public class UrlUtil
         url.append(context);
         return url.toString();
     }
-
-    /**
-     * Builds up the Url to Adw based on the settings in the
-     *  {@link SysAdminParams}.
-     * @return Adw Url such as https://col.ab.or.ate/#/
-     *  or http://localhost:8081/#/
-     */
-    public static String getWorkspaceUrl(SysAdminParams sysAdminParams)
-    {
-        return buildWorkspaceUrl(
-                sysAdminParams.getAlfrescoProtocol(),
-                sysAdminParams.getAlfrescoHost(),
-                sysAdminParams.getAlfrescoPort());
-    }
-
-    protected static String buildWorkspaceUrl(String workSpaceProtocol, String workspaceHost, int workspacePort) {
-        StringBuilder workspaceUrl = new StringBuilder();
-        workspaceUrl.append(workSpaceProtocol);
-        workspaceUrl.append("://");
-        workspaceUrl.append(workspaceHost);
-        if ("http".equals(workSpaceProtocol) && workspacePort == 80)
-        {
-            // Not needed
-        }
-        else if ("https".equals(workSpaceProtocol) && workspacePort == 443)
-        {
-            // Not needed
-        }
-        else
-        {
-            workspaceUrl.append(':');
-            workspaceUrl.append(workspacePort);
-        }
-
-        return workspaceUrl.toString();
-    }
-
-    /**
-     * Replaces the repo base url placeholder, namely {@literal ${repoBaseUrl}}, with <b>workspace</b> url.
-     *
-     * @param value          the string value which contains the repoBase url placeholder
-     * @param sysAdminParams the {@code SysAdminParams} object
-     * @return if the given {@code value} contains share url placeholder,
-     * the placeholder is replaced with share url; otherwise, the given {@code value} is simply returned
-     */
-
-    public static String replaceRepoBaseUrlPlaceholder(String value, SysAdminParams sysAdminParams)
-    {
-        if (value != null)
-        {
-            return REPOBASE_PATTERN.matcher(value).replaceAll(getWorkspaceUrl(sysAdminParams));
-        }
-        return value;
-    }
-
-    public static String replaceWorkSpaceUrlPlaceholder(String pageUrl,String workspaceUrl)
-    {
-        if (pageUrl != null)
-        {
-            return WORKSPACE_PATTERN.matcher(pageUrl).replaceAll(workspaceUrl);
-        }
-        return pageUrl;
-    }
-
 }

repository/src/main/resources/alfresco/client/config/repo-clients-apps.properties

@@ -20,15 +20,6 @@ repo.client-app.share.resetPasswordPageUrl=${shareUrl}/page/reset-password
 repo.client-app.share.confirmResetPasswordTemplatePath=
 
 ### Digital workspace template configurations
-#repo.client-app.workspace.inviteModeratedTemplatePath=
-
-repo.client-app.workspace.workspaceUrl=${repoBaseUrl}/workspace
-
-repo.client-app.workspace.templateAssetsUrl=${workspaceUrl}/images
-
-# reset password request email template path
-repo.client-app.workspace.requestResetPasswordTemplatePath=alfresco/templates/reset-password-email-templates/forgot-password-email-template.ftl
-# reset password UI page url
-repo.client-app.workspace.resetPasswordPageUrl=${workspaceUrl}/reset-password/
-# reset password confirmation email template path
-repo.client-app.workspace.confirmResetPasswordTemplatePath=
+repo.client-app.workspace.inviteModeratedTemplatePath=
+repo.client-app.workspace.workspaceUrl=workspace
+repo.client-app.workspace.templateAssetsUrl=${alfrescoUrl}/images

repository/src/main/resources/alfresco/extension/custom-log4j.properties.sample

@@ -0,0 +1,3 @@
+log4j.logger.org.alfresco.repo.content.transform.TransformerDebug=debug
+log4j.logger.org.alfresco.util.exec.RuntimeExecBootstrapBean=debug
+log4j.logger.org.alfresco.util.exec.RuntimeExec=debug

repository/src/main/resources/alfresco/extension/custom-log4j2.properties.sample

@@ -1,8 +0,0 @@
-logger.alfresco-repo-content-transform-TransformerDebug.name=org.alfresco.repo.content.transform.TransformerDebug
-logger.alfresco-repo-content-transform-TransformerDebug.level=debug
-
-logger.alfresco-util-exec-RuntimeExecBootstrapBean.name=org.alfresco.util.exec.RuntimeExecBootstrapBean
-logger.alfresco-util-exec-RuntimeExecBootstrapBean.level=debug
-
-logger.alfresco-util-exec-RuntimeExec.name=org.alfresco.util.exec.RuntimeExec
-logger.alfresco-util-exec-RuntimeExec.level=debug

repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml

@@ -1147,20 +1147,6 @@
             parentNode.id = #{parentNode.id} and
             a.child_node_id IS NULL
     </select>
-
-    <select id="select_AssocsNotLinkedByTwoOtherAssocs" parameterType="ChildAssoc" resultType="java.lang.String">
-        select distinct c.qname_localname
-        from alf_child_assoc c
-        where c.parent_node_id = #{parentNode.id}
-        and not exists (
-            select 1
-            from alf_child_assoc a
-            join alf_child_assoc z
-            on z.parent_node_id = #{parentNode.id}
-            and z.child_node_id = a.parent_node_id
-            where c.child_node_id = a.child_node_id
-        );
-    </select>
     
     <select id="select_ChildAssocsByPropertyValue" parameterType="ChildProperty" resultMap="result_ChildAssoc">
         <include refid="alfresco.node.select_ChildAssoc_Results"/>

repository/src/main/resources/alfresco/public-services-security-context.xml

@@ -425,7 +425,6 @@
                org.alfresco.service.cmr.repository.NodeService.getStoreArchiveNode=ACL_NODE.0.sys:base.Read
                org.alfresco.service.cmr.repository.NodeService.restoreNode=ACL_NODE.0.sys:base.DeleteNode,ACL_NODE.1.sys:base.CreateChildren
                org.alfresco.service.cmr.repository.NodeService.getChildAssocsWithoutParentAssocsOfType=ACL_NODE.0.sys:base.ReadProperties,AFTER_ACL_NODE.sys:base.ReadProperties
-               org.alfresco.service.cmr.repository.NodeService.findAssocsNotLinkedByTwoOtherAssocs=ACL_NODE.0.sys:base.ReadProperties,AFTER_ACL_NODE.sys:base.ReadProperties
                org.alfresco.service.cmr.repository.NodeService.countChildAssocs=ACL_NODE.0.sys:base.ReadChildren
                org.alfresco.service.cmr.repository.NodeService.*=ACL_DENY
             </value>
@@ -574,7 +573,6 @@
                 org.alfresco.service.cmr.search.CategoryService.deleteClassification=ACL_ALLOW
                 org.alfresco.service.cmr.search.CategoryService.deleteCategory=ACL_ALLOW
                 org.alfresco.service.cmr.search.CategoryService.getTopCategories=ACL_ALLOW
-                org.alfresco.service.cmr.search.CategoryService.getRootCategoryNodeRef=ACL_ALLOW
                 org.alfresco.service.cmr.search.CategoryService.*=ACL_DENY
             </value>
         </property>

repository/src/main/resources/alfresco/templates/reset-password-email-templates/forgot-password-email-template.ftl

@@ -1,12 +0,0 @@
-<html>
-<head>
-   <title>Forgot Password</title>
-</head>
-<body>
-<p>You are receiving this email because you(or someone else) requested the password reset of your account.</p>
-<p>Please click on the following link, or paste this url into your browser to complete the process:</p>
-<p><a href="${reset_password_url}">${reset_password_url}</a></p>
-<p>If you received this in error, you can safely ignore it.</p>
-<p>Kind regards</p>
-</body>
-</html>

repository/src/test/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java

@@ -92,10 +92,6 @@ public class ResetPasswordServiceImplTest
     private static TestPerson testPerson;
     private static EmailUtil emailUtil;
 
-    private static TestPerson testPersonForWorkspace;
-
-
-
     @BeforeClass
     public static void initStaticData() throws Exception
     {
@@ -118,18 +114,9 @@ public class ResetPasswordServiceImplTest
                     .setPassword("password")
                     .setEmail(userName + "@example.com");
 
-        String userNameForWorkspace = "shane.doe" + System.currentTimeMillis();
-        testPersonForWorkspace = new TestPerson()
-                .setUserName(userNameForWorkspace)
-                .setFirstName("Shane")
-                .setLastName("doe")
-                .setPassword("password")
-                .setEmail(userNameForWorkspace + "@example.com");
-
         transactionHelper.doInTransaction((RetryingTransactionCallback<Void>) () ->
         {
             createUser(testPerson);
-            createUser(testPersonForWorkspace);
             return null;
         });
 
@@ -166,86 +153,6 @@ public class ResetPasswordServiceImplTest
         emailUtil.reset();
     }
 
-    @Test
-    public void testResetPasswordForClientWorkspace() throws Exception
-    {
-        // Try the credential before change of password
-        authenticateUser(testPersonForWorkspace.userName, testPersonForWorkspace.password);
-
-        // Make sure to run as system
-        AuthenticationUtil.clearCurrentSecurityContext();
-        AuthenticationUtil.setRunAsUserSystem();
-
-        // Request password reset
-        resetPasswordService.requestReset(testPersonForWorkspace.userName, "workspace");
-        assertEquals("A reset password email should have been sent.", 1, emailUtil.getSentCount());
-        // Check the email
-        MimeMessage msg = emailUtil.getLastEmail();
-        assertNotNull("There should be an email.", msg);
-        assertEquals("Should've been only one email recipient.", 1, msg.getAllRecipients().length);
-        // Check the recipient is the person who requested the reset password
-        assertEquals(testPersonForWorkspace.email, msg.getAllRecipients()[0].toString());
-        //Check the sender is what we set as default
-        assertEquals(DEFAULT_SENDER, msg.getFrom()[0].toString());
-        // There should be a subject
-        assertNotNull("There should be a subject.", msg.getSubject());
-        // Check the default email subject - (check that we are sending the right email)
-        String emailSubjectKey = getDeclaredField(SendResetPasswordEmailDelegate.class, "EMAIL_SUBJECT_KEY");
-        assertNotNull(emailSubjectKey);
-        assertEquals(msg.getSubject(), I18NUtil.getMessage(emailSubjectKey));
-
-        // Check the reset password url.
-        String resetPasswordUrl = (String) emailUtil.getLastEmailTemplateModelValue("reset_password_url");
-        assertNotNull("Wrong email is sent.", resetPasswordUrl);
-        // Get the workflow id and key
-        Pair<String, String> pair = getWorkflowIdAndKeyFromUrl(resetPasswordUrl);
-        assertNotNull("Workflow Id can't be null.", pair.getFirst());
-        assertNotNull("Workflow Key can't be null.", pair.getSecond());
-
-        emailUtil.reset();
-        // Now that we have got the email, try to reset the password
-        ResetPasswordDetails passwordDetails = new ResetPasswordDetails()
-                .setUserId(testPersonForWorkspace.userName)
-                .setPassword("newPassword")
-                .setWorkflowId(pair.getFirst())
-                .setWorkflowKey(pair.getSecond());
-
-        resetPasswordService.initiateResetPassword(passwordDetails);
-        assertEquals("A reset password confirmation email should have been sent.", 1, emailUtil.getSentCount());
-        // Check the email
-        msg = emailUtil.getLastEmail();
-        assertNotNull("There should be an email.", msg);
-        assertEquals("Should've been only one email recipient.", 1, msg.getAllRecipients().length);
-        // Check the recipient is the person who requested the reset password
-        assertEquals(testPersonForWorkspace.email, msg.getAllRecipients()[0].toString());
-        // Check the sender is what we set as default
-        assertEquals(DEFAULT_SENDER, msg.getFrom()[0].toString());
-        // There should be a subject
-        assertNotNull("There should be a subject.", msg.getSubject());
-        // Check the default email subject - (check that we are sending the right email)
-        emailSubjectKey = getDeclaredField(SendResetPasswordConfirmationEmailDelegate.class, "EMAIL_SUBJECT_KEY");
-        assertNotNull(emailSubjectKey);
-        assertEquals(msg.getSubject(), I18NUtil.getMessage(emailSubjectKey));
-
-        // Try the old credential
-        TestHelper.assertThrows(() -> authenticateUser(testPersonForWorkspace.userName, testPersonForWorkspace.password),
-                AuthenticationException.class,
-                "As the user changed her password, the authentication should have failed.");
-
-        // Try the new credential
-        authenticateUser(testPersonForWorkspace.userName, "newPassword");
-
-        // Make sure to run as system
-        AuthenticationUtil.clearCurrentSecurityContext();
-        AuthenticationUtil.setRunAsUserSystem();
-        emailUtil.reset();
-        // Try reset again with the used workflow
-        TestHelper.assertThrows(() -> resetPasswordService.initiateResetPassword(passwordDetails),
-                InvalidResetPasswordWorkflowException.class,
-                "The workflow instance is not active (it has already been used).");
-        assertEquals("No email should have been sent.", 0, emailUtil.getSentCount());
-    }
-
     @Test
     public void testResetPassword() throws Exception
     {

repository/src/test/resources/log4j.properties

@@ -0,0 +1,266 @@
+#TAKEN FROM ALFRESCO_CORE PROJECT
+# Set root logger level to error
+log4j.rootLogger=error, Console, File
+
+###### Console appender definition #######
+
+# All outputs currently set to be a ConsoleAppender.
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+
+# use log4j NDC to replace %x with tenant domain / username
+log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
+#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
+
+###### File appender definition #######
+log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.File.File=alfresco.log
+log4j.appender.File.Append=true
+log4j.appender.File.DatePattern='.'yyyy-MM-dd
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
+
+###### Hibernate specific appender definition #######
+#log4j.appender.file=org.apache.log4j.FileAppender
+#log4j.appender.file.File=hibernate.log
+#log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+
+###### Log level overrides #######
+
+# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
+# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
+# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
+# Log4j addLoggerMBean as long as the logger exists and has been loaded.
+
+# Hibernate
+log4j.logger.org.hibernate=error
+log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
+log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
+log4j.logger.org.hibernate.type=warn
+log4j.logger.org.hibernate.cfg.SettingsFactory=warn
+
+# Spring
+log4j.logger.org.springframework=warn
+# Turn off Spring remoting warnings that should really be info or debug.
+log4j.logger.org.springframework.remoting.support=error
+log4j.logger.org.springframework.util=error
+
+# Axis/WSS4J
+log4j.logger.org.apache.axis=info
+log4j.logger.org.apache.ws=info
+
+# CXF
+log4j.logger.org.apache.cxf=error
+
+# MyFaces
+log4j.logger.org.apache.myfaces.util.DebugUtils=info
+log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
+log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
+log4j.logger.org.apache.myfaces.taglib=error
+
+# log prepared statement cache activity ###
+log4j.logger.org.hibernate.ps.PreparedStatementCache=info
+
+# Alfresco
+log4j.logger.org.alfresco=error
+log4j.logger.org.alfresco.repo.admin=info
+log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
+log4j.logger.org.alfresco.repo.model.filefolder=warn
+log4j.logger.org.alfresco.repo.tenant=info
+log4j.logger.org.alfresco.config=warn
+log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
+log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
+log4j.logger.org.alfresco.repo.management.subsystems=warn
+log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
+log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
+log4j.logger.org.alfresco.repo.security.sync=info
+log4j.logger.org.alfresco.repo.security.person=info
+
+log4j.logger.org.alfresco.sample=info
+log4j.logger.org.alfresco.web=info
+#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
+#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
+#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
+#log4j.logger.org.alfresco.web.bean.clipboard=debug
+log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
+#log4j.logger.org.alfresco.web.page=debug
+
+log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
+#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
+
+log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
+log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
+
+# Specific patches
+log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
+log4j.logger.org.alfresco.repo.version.VersionMigrator=info
+
+log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
+log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
+log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
+log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
+log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
+log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
+log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
+log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
+log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=debug
+log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
+log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
+log4j.logger.org.alfresco.enterprise.repo.cluster=info
+log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
+#log4j.logger.org.alfresco.repo.thumbnail=debug
+
+#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
+
+log4j.logger.org.alfresco.repo.workflow=info
+
+# FTP server debugging
+log4j.logger.org.alfresco.ftp.protocol=error
+#log4j.logger.org.alfresco.ftp.server=debug
+
+# WebDAV debugging
+#log4j.logger.org.alfresco.webdav.protocol=debug
+log4j.logger.org.alfresco.webdav.protocol=info
+
+# Kerberos servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
+
+# File servers
+log4j.logger.org.alfresco.fileserver=warn
+
+# Repo filesystem debug logging
+#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
+
+# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
+log4j.logger.org.alfresco.repo.node.integrity=ERROR
+
+# Indexer debugging
+log4j.logger.org.alfresco.repo.search.Indexer=error
+#log4j.logger.org.alfresco.repo.search.Indexer=debug
+
+log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
+log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
+#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
+
+# Audit debugging
+# log4j.logger.org.alfresco.repo.audit=DEBUG
+# log4j.logger.org.alfresco.repo.audit.model=DEBUG
+
+# Property sheet and modelling debugging
+# change to error to hide the warnings about missing properties and associations
+log4j.logger.alfresco.missingProperties=warn
+
+# Dictionary/Model debugging
+log4j.logger.org.alfresco.repo.dictionary=warn
+log4j.logger.org.alfresco.repo.dictionary.types.period=warn
+
+# Virtualization Server Registry
+log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
+
+# Spring context runtime property setter
+log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
+
+# Debugging options for clustering
+log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
+log4j.logger.org.alfresco.repo.content.replication=error
+
+#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
+
+# Activity service
+log4j.logger.org.alfresco.repo.activities=warn
+
+# User usage tracking
+log4j.logger.org.alfresco.repo.usage=info
+
+# Sharepoint
+log4j.logger.org.alfresco.module.vti=info
+
+# Forms Engine
+log4j.logger.org.alfresco.web.config.forms=info
+log4j.logger.org.alfresco.web.scripts.forms=info
+
+# CMIS
+log4j.logger.org.alfresco.opencmis=error
+log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
+log4j.logger.org.alfresco.cmis=error
+log4j.logger.org.alfresco.cmis.dictionary=warn
+log4j.logger.org.apache.chemistry.opencmis=info
+log4j.logger.org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet=OFF
+log4j.logger.org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet=OFF
+
+# IMAP
+log4j.logger.org.alfresco.repo.imap=info
+
+#log4j.logger.org.alfresco.repo.googledocs=debug
+
+###### Scripting #######
+
+# Web Framework
+log4j.logger.org.springframework.extensions.webscripts=info
+log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
+log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
+
+# Repository
+log4j.logger.org.alfresco.repo.web.scripts=warn
+log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
+log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
+log4j.logger.org.alfresco.repo.jscript=error
+log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
+log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
+log4j.logger.org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl=off
+log4j.logger.org.alfresco.repo.domain.schema.script.ScriptExecutorImpl=info
+log4j.logger.org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor=off
+
+log4j.logger.org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl=info
+
+# Bulk Filesystem Import Tool
+log4j.logger.org.alfresco.repo.bulkimport=warn
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+log4j.logger.freemarker.runtime=
+
+# Metadata extraction
+log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
+
+# no index support
+log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
+log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
+
+# lucene index warnings
+log4j.logger.org.alfresco.repo.search.impl.lucene.index.IndexInfo=warn
+
+# Warn about RMI socket bind retries.
+log4j.logger.org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory=warn
+
+log4j.logger.org.alfresco.repo.usage.RepoUsageMonitor=info
+
+log4j.logger.org.alfresco.repo.site.SiteServiceImpl=DEBUG
+#log4j.logger.org.alfresco.repo.action.ActionServiceImpl=DEBUG
+log4j.logger.org.alfresco.repo.security.person.PersonServiceImpl=DEBUG
+
+# identity service authentication
+log4j.logger.org.alfresco.repo.security.authentication.identityservice=debug
+log4j.logger.org.keycloak=debug
+
+# Renditions and Transforms
+log4j.logger.org.alfresco.repo.content.transform.TransformerDebug=debug
+
+log4j.logger.org.alfresco.repo.rendition2=debug
+#log4j.logger.org.alfresco.repo.rendition2.LocalTransformClient=debug
+#log4j.logger.org.alfresco.repo.rendition.RenditionServiceImpl=debug
+#log4j.logger.org.alfresco.enterprise.repo.rendition2.RemoteTransformClient=debug
+log4j.logger.org.alfresco.repo.thumbnail.ThumbnailServiceImplTest=DEBUG
+log4j.logger.org.alfresco.repo.rendition2.RenditionService2Impl=DEBUG
+
+#log4j.logger.org.alfresco.repo.content.transform.LocalTransformServiceRegistry=debug
+#log4j.logger.org.alfresco.enterprise.repo.rendition2.RemoteTransformServiceRegistry=debug
+#log4j.logger.org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl=debug
+#log4j.logger.org.alfresco.repo.content.MimetypeMap=debug
+#log4j.logger.org.alfresco.repo.content.transform.LocalTransform=trace
+
+#log4j.logger.org.alfresco.repo.rawevents=debug
+
+#log4j.logger.org.alfresco.repo.event2=trace

repository/src/test/resources/log4j2.properties

@@ -1,469 +0,0 @@
-# Set root logger level to error
-rootLogger.level=error
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### Console appender definition #######
-# All outputs currently set to be a ConsoleAppender.
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-# use log4j NDC to replace %x with tenant domain / username
-appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=alfresco.log
-appender.rolling.filePattern=alfresco.log.%d{yyyy-MM-dd}
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.rolling.policies.time.interval = 1
-
-###### Log level overrides #######
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-logger.hibernate.name=org.hibernate
-logger.hibernate.level=error
-
-logger.hibernate-util-JDBCExceptionReporter.name=org.hibernate.util.JDBCExceptionReporter
-logger.hibernate-util-JDBCExceptionReporter.level=fatal
-
-logger.hibernate-event-def-AbstractFlushingEventListener.name=org.hibernate.event.def.AbstractFlushingEventListener
-logger.hibernate-event-def-AbstractFlushingEventListener.level=fatal
-
-logger.hibernate-type.name=org.hibernate.type
-logger.hibernate-type.level=warn
-
-logger.hibernate-cfg-SettingsFactory.name=org.hibernate.cfg.SettingsFactory
-logger.hibernate-cfg-SettingsFactory.level=warn
-
-# Spring
-logger.springframework.name=org.springframework
-logger.springframework.level=warn
-
-# Turn off Spring remoting warnings that should really be info or debug.
-logger.springframework-remoting-support.name=org.springframework.remoting.support
-logger.springframework-remoting-support.level=error
-
-logger.springframework-util.name=org.springframework.util
-logger.springframework-util.level=error
-
-# Axis/WSS4J
-logger.apache-axis.name=org.apache.axis
-logger.apache-axis.level=info
-
-logger.apache-ws.name=org.apache.ws
-logger.apache-ws.level=info
-
-# CXF
-logger.apache-cxf.name=org.apache.cxf
-logger.apache-cxf.level=error
-
-# MyFaces
-logger.apache-myfaces-util-DebugUtils.name=org.apache.myfaces.util.DebugUtils
-logger.apache-myfaces-util-DebugUtils.level=info
-
-logger.apache-myfaces-el-VariableResolverImpl.name=org.apache.myfaces.el.VariableResolverImpl
-logger.apache-myfaces-el-VariableResolverImpl.level=error
-
-logger.apache-myfaces-application-jsp-JspViewHandlerImpl.name=org.apache.myfaces.application.jsp.JspViewHandlerImpl
-logger.apache-myfaces-application-jsp-JspViewHandlerImpl.level=error
-
-logger.apache-myfaces-taglib.name=org.apache.myfaces.taglib
-logger.apache-myfaces-taglib.level=error
-
-# log prepared statement cache activity ###
-logger.hibernate-ps-PreparedStatementCache.name=org.hibernate.ps.PreparedStatementCache
-logger.hibernate-ps-PreparedStatementCache.level=info
-
-# Alfresco
-logger.alfresco.name=org.alfresco
-logger.alfresco.level=error
-
-logger.alfresco-repo-admin.name=org.alfresco.repo.admin
-logger.alfresco-repo-admin.level=info
-
-logger.alfresco-repo-transaction.name=org.alfresco.repo.transaction
-logger.alfresco-repo-transaction.level=warn
-
-logger.alfresco-repo-cache-TransactionalCache.name=org.alfresco.repo.cache.TransactionalCache
-logger.alfresco-repo-cache-TransactionalCache.level=warn
-
-logger.alfresco-repo-model-filefolder.name=org.alfresco.repo.model.filefolder
-logger.alfresco-repo-model-filefolder.level=warn
-
-logger.alfresco-repo-tenant.name=org.alfresco.repo.tenant
-logger.alfresco-repo-tenant.level=info
-
-logger.alfresco-config.name=org.alfresco.config
-logger.alfresco-config.level=warn
-
-logger.alfresco-config-JndiObjectFactoryBean.name=org.alfresco.config.JndiObjectFactoryBean
-logger.alfresco-config-JndiObjectFactoryBean.level=warn
-
-logger.alfresco-config-JBossEnabledWebApplicationContext.name=org.alfresco.config.JBossEnabledWebApplicationContext
-logger.alfresco-config-JBossEnabledWebApplicationContext.level=warn
-
-logger.alfresco-repo-management-subsystems.name=org.alfresco.repo.management.subsystems
-logger.alfresco-repo-management-subsystems.level=warn
-
-logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory
-logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.level=info
-
-logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext
-logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.level=warn
-
-logger.alfresco-repo-security-sync.name=org.alfresco.repo.security.sync
-logger.alfresco-repo-security-sync.level=info
-
-logger.alfresco-repo-security-person.name=org.alfresco.repo.security.person
-logger.alfresco-repo-security-person.level=info
-
-logger.alfresco-sample.name=org.alfresco.sample
-logger.alfresco-sample.level=info
-
-logger.alfresco-web.name=org.alfresco.web
-logger.alfresco-web.level=info
-
-#logger.alfresco-web-app-AlfrescoNavigationHandler.name=org.alfresco.web.app.AlfrescoNavigationHandler
-#logger.alfresco-web-app-AlfrescoNavigationHandler.level=debug
-
-#logger.alfresco-web-ui-repo-component-UIActions.name=org.alfresco.web.ui.repo.component.UIActions
-#logger.alfresco-web-ui-repo-component-UIActions.level=debug
-
-#logger.alfresco-web-ui-repo-tag-PageTag.name=org.alfresco.web.ui.repo.tag.PageTag
-#logger.alfresco-web-ui-repo-tag-PageTag.level=debug
-
-#logger.alfresco-web-bean-clipboard.name=org.alfresco.web.bean.clipboard
-#logger.alfresco-web-bean-clipboard.level=debug
-
-logger.alfresco-service-descriptor-DescriptorService.name=org.alfresco.service.descriptor.DescriptorService
-logger.alfresco-service-descriptor-DescriptorService.level=info
-
-#logger.alfresco-web-page.name=org.alfresco.web.page
-#logger.alfresco-web-page.level=debug
-
-logger.alfresco-repo-importer-ImporterBootstrap.name=org.alfresco.repo.importer.ImporterBootstrap
-logger.alfresco-repo-importer-ImporterBootstrap.level=error
-
-#logger.alfresco-repo-importer-ImporterBootstrap.name=org.alfresco.repo.importer.ImporterBootstrap
-#logger.alfresco-repo-importer-ImporterBootstrap.level=info
-
-logger.alfresco-repo-admin-patch-PatchExecuter.name=org.alfresco.repo.admin.patch.PatchExecuter
-logger.alfresco-repo-admin-patch-PatchExecuter.level=info
-
-logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.name=org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl
-logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.level=info
-
-# Specific patches
-logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.name=org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch
-logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.level=info
-
-logger.alfresco-repo-version-VersionMigrator.name=org.alfresco.repo.version.VersionMigrator
-logger.alfresco-repo-version-VersionMigrator.level=info
-
-logger.alfresco-repo-module-ModuleServiceImpl.name=org.alfresco.repo.module.ModuleServiceImpl
-logger.alfresco-repo-module-ModuleServiceImpl.level=info
-
-logger.alfresco-repo-domain-schema-SchemaBootstrap.name=org.alfresco.repo.domain.schema.SchemaBootstrap
-logger.alfresco-repo-domain-schema-SchemaBootstrap.level=info
-
-logger.alfresco-repo-admin-ConfigurationChecker.name=org.alfresco.repo.admin.ConfigurationChecker
-logger.alfresco-repo-admin-ConfigurationChecker.level=info
-
-logger.alfresco-repo-node-index-AbstractReindexComponent.name=org.alfresco.repo.node.index.AbstractReindexComponent
-logger.alfresco-repo-node-index-AbstractReindexComponent.level=warn
-
-logger.alfresco-repo-node-index-IndexTransactionTracker.name=org.alfresco.repo.node.index.IndexTransactionTracker
-logger.alfresco-repo-node-index-IndexTransactionTracker.level=warn
-
-logger.alfresco-repo-node-index-FullIndexRecoveryComponent.name=org.alfresco.repo.node.index.FullIndexRecoveryComponent
-logger.alfresco-repo-node-index-FullIndexRecoveryComponent.level=info
-
-#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.name=org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl
-#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.level=warn
-
-logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.name=org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor
-logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.level=warn
-
-logger.alfresco-repo-transaction-RetryingTransactionHelper.name=org.alfresco.repo.transaction.RetryingTransactionHelper
-logger.alfresco-repo-transaction-RetryingTransactionHelper.level=warn
-
-logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.name=org.alfresco.util.transaction.SpringAwareUserTransaction.trace
-logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.level=warn
-
-logger.alfresco-util-AbstractTriggerBean.name=org.alfresco.util.AbstractTriggerBean
-logger.alfresco-util-AbstractTriggerBean.level=warn
-
-logger.alfresco-enterprise-repo-cluster.name=org.alfresco.enterprise.repo.cluster
-logger.alfresco-enterprise-repo-cluster.level=info
-
-logger.alfresco-repo-version-Version2ServiceImpl.name=org.alfresco.repo.version.Version2ServiceImpl
-logger.alfresco-repo-version-Version2ServiceImpl.level=warn
-
-#logger.alfresco-web-app-DebugPhaseListener.name=org.alfresco.web.app.DebugPhaseListener
-#logger.alfresco-web-app-DebugPhaseListener.level=debug
-
-logger.alfresco-repo-node-db-NodeStringLengthWorker.name=org.alfresco.repo.node.db.NodeStringLengthWorker
-logger.alfresco-repo-node-db-NodeStringLengthWorker.level=info
-
-logger.alfresco-repo-workflow.name=org.alfresco.repo.workflow
-logger.alfresco-repo-workflow.level=info
-
-# FTP server debugging
-logger.alfresco-ftp-protocol.name=org.alfresco.ftp.protocol
-logger.alfresco-ftp-protocol.level=error
-
-#logger.alfresco-ftp-server.name=org.alfresco.ftp.server
-#logger.alfresco-ftp-server.level=debug
-
-# WebDAV debugging
-#logger.alfresco-webdav-protocol.name=org.alfresco.webdav.protocol
-#logger.alfresco-webdav-protocol.level=debug
-
-logger.alfresco-webdav-protocol.name=org.alfresco.webdav.protocol
-logger.alfresco-webdav-protocol.level=info
-
-# Kerberos servlet filters
-#logger.alfresco-web-app-servlet-KerberosAuthenticationFilter.name=org.alfresco.web.app.servlet.KerberosAuthenticationFilter
-#logger.alfresco-web-app-servlet-KerberosAuthenticationFilter.level=debug
-
-#logger.alfresco-repo-webdav-auth-KerberosAuthenticationFilter.name=org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter
-#logger.alfresco-repo-webdav-auth-KerberosAuthenticationFilter.level=debug
-
-# File servers
-logger.alfresco-fileserver.name=org.alfresco.fileserver
-logger.alfresco-fileserver.level=warn
-
-# Repo filesystem debug logging
-#logger.alfresco-filesys-repo-ContentDiskDriver.name=org.alfresco.filesys.repo.ContentDiskDriver
-#logger.alfresco-filesys-repo-ContentDiskDriver.level=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-logger.alfresco-repo-node-integrity.name=org.alfresco.repo.node.integrity
-logger.alfresco-repo-node-integrity.level=error
-
-# Authentication
-logger.alfresco-filesys-auth-ftp.name=org.alfresco.filesys.auth.ftp
-logger.alfresco-filesys-auth-ftp.level=warn
-
-logger.alfresco-ftp-protocol-auth.name=org.alfresco.ftp.protocol.auth
-logger.alfresco-ftp-protocol-auth.level=warn
-
-logger.alfresco-repo-webdav-auth.name=org.alfresco.repo.webdav.auth
-logger.alfresco-repo-webdav-auth.level=warn
-
-logger.alfresco-repo-web-auth.name=org.alfresco.repo.web.auth
-logger.alfresco-repo-web-auth.level=warn
-
-logger.alfresco-web-app-servlet.name=org.alfresco.web.app.servlet
-logger.alfresco-web-app-servlet.level=warn
-
-# Used also for brute force attack detection
-logger.alfresco-repo-security-authentication.name=org.alfresco.repo.security.authentication
-logger.alfresco-repo-security-authentication.level=warn
-
-# Indexer debugging
-logger.alfresco-repo-search-Indexer.name=org.alfresco.repo.search.Indexer
-logger.alfresco-repo-search-Indexer.level=error
-
-#logger.alfresco-repo-search-Indexer.name=org.alfresco.repo.search.Indexer
-#logger.alfresco-repo-search-Indexer.level=debug
-
-logger.alfresco-repo-search-impl-lucene-index.name=org.alfresco.repo.search.impl.lucene.index
-logger.alfresco-repo-search-impl-lucene-index.level=error
-
-logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.name=org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl
-logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.level=warn
-
-#logger.alfresco-repo-search-impl-lucene-index.name=org.alfresco.repo.search.impl.lucene.index
-#logger.alfresco-repo-search-impl-lucene-index.level=debug
-
-# Audit debugging
-#logger.alfresco-repo-audit.name=org.alfresco.repo.audit
-#logger.alfresco-repo-audit.level=debug
-#logger.alfresco-repo-audit-model.name=org.alfresco.repo.audit.model
-#logger.alfresco-repo-audit-model.level=debug
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-logger.missingProperties.name=alfresco.missingProperties
-logger.missingProperties.level=warn
-
-# Dictionary/Model debugging
-logger.alfresco-repo-dictionary.name=org.alfresco.repo.dictionary
-logger.alfresco-repo-dictionary.level=warn
-
-logger.alfresco-repo-dictionary-types-period.name=org.alfresco.repo.dictionary.types.period
-logger.alfresco-repo-dictionary-types-period.level=warn
-
-# Virtualization Server Registry
-logger.alfresco-mbeans-VirtServerRegistry.name=org.alfresco.mbeans.VirtServerRegistry
-logger.alfresco-mbeans-VirtServerRegistry.level=error
-
-# Spring context runtime property setter
-logger.alfresco-util-RuntimeSystemPropertiesSetter.name=org.alfresco.util.RuntimeSystemPropertiesSetter
-logger.alfresco-util-RuntimeSystemPropertiesSetter.level=info
-
-# Debugging options for clustering
-logger.alfresco-repo-content-ReplicatingContentStore.name=org.alfresco.repo.content.ReplicatingContentStore
-logger.alfresco-repo-content-ReplicatingContentStore.level=error
-
-logger.alfresco-repo-content-replication.name=org.alfresco.repo.content.replication
-logger.alfresco-repo-content-replication.level=error
-
-#logger.alfresco-repo-deploy-DeploymentServiceImpl.name=org.alfresco.repo.deploy.DeploymentServiceImpl
-#logger.alfresco-repo-deploy-DeploymentServiceImpl.level=debug
-
-# Activity service
-logger.alfresco-repo-activities.name=org.alfresco.repo.activities
-logger.alfresco-repo-activities.level=warn
-
-# User usage tracking
-logger.alfresco-repo-usage.name=org.alfresco.repo.usage
-logger.alfresco-repo-usage.level=info
-
-# Sharepoint
-logger.alfresco-module-vti.name=org.alfresco.module.vti
-logger.alfresco-module-vti.level=info
-
-# Forms Engine
-logger.alfresco-web-config-forms.name=org.alfresco.web.config.forms
-logger.alfresco-web-config-forms.level=info
-
-logger.alfresco-web-scripts-forms.name=org.alfresco.web.scripts.forms
-logger.alfresco-web-scripts-forms.level=info
-
-# CMIS
-logger.alfresco-opencmis.name=org.alfresco.opencmis
-logger.alfresco-opencmis.level=error
-
-logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.name=org.alfresco.opencmis.AlfrescoCmisServiceInterceptor
-logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.level=error
-
-logger.alfresco-cmis.name=org.alfresco.cmis
-logger.alfresco-cmis.level=error
-
-logger.alfresco-cmis-dictionary.name=org.alfresco.cmis.dictionary
-logger.alfresco-cmis-dictionary.level=warn
-
-logger.apache-chemistry-opencmis.name=org.apache.chemistry.opencmis
-logger.apache-chemistry-opencmis.level=info
-
-logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.name=org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet
-logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.level=off
-
-logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.name=org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet
-logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.level=off
-
-# IMAP
-logger.alfresco-repo-imap.name=org.alfresco.repo.imap
-logger.alfresco-repo-imap.level=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler
-logger.jbpm-graph-def-GraphElement.name=org.jbpm.graph.def.GraphElement
-logger.jbpm-graph-def-GraphElement.level=fatal
-
-#logger.alfresco-repo-googledocs.name=org.alfresco.repo.googledocs
-#logger.alfresco-repo-googledocs.level=debug
-
-###### Scripting #######
-# Web Framework
-logger.springframework-extensions-webscripts.name=org.springframework.extensions.webscripts
-logger.springframework-extensions-webscripts.level=info
-
-logger.springframework-extensions-webscripts-ScriptLogger.name=org.springframework.extensions.webscripts.ScriptLogger
-logger.springframework-extensions-webscripts-ScriptLogger.level=warn
-
-logger.springframework-extensions-webscripts-ScriptDebugger.name=org.springframework.extensions.webscripts.ScriptDebugger
-logger.springframework-extensions-webscripts-ScriptDebugger.level=off
-
-# Repository
-logger.alfresco-repo-web-scripts.name=org.alfresco.repo.web.scripts
-logger.alfresco-repo-web-scripts.level=warn
-
-logger.alfresco-repo-web-scripts-BaseWebScriptTest.name=org.alfresco.repo.web.scripts.BaseWebScriptTest
-logger.alfresco-repo-web-scripts-BaseWebScriptTest.level=info
-
-logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.name=org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger
-logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.level=off
-
-logger.alfresco-repo-jscript.name=org.alfresco.repo.jscript
-logger.alfresco-repo-jscript.level=error
-
-logger.alfresco-repo-jscript-ScriptLogger.name=org.alfresco.repo.jscript.ScriptLogger
-logger.alfresco-repo-jscript-ScriptLogger.level=warn
-
-logger.alfresco-repo-cmis-rest-CMISTest.name=org.alfresco.repo.cmis.rest.CMISTest
-logger.alfresco-repo-cmis-rest-CMISTest.level=info
-
-logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl
-logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.level=off
-
-logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptExecutorImpl
-logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.level=info
-
-logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.name=org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor
-logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.level=off
-
-logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.name=org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl
-logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.level=info
-
-# Bulk Filesystem Import Tool
-logger.alfresco-repo-bulkimport.name=org.alfresco.repo.bulkimport
-logger.alfresco-repo-bulkimport.level=warn
-
-# Freemarker
-# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-logger.runtime.name=freemarker.runtime
-logger.runtime.level=
-
-# Metadata extraction
-logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.name=org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter
-logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.level=warn
-
-# no index support
-logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.name=org.alfresco.repo.search.impl.noindex.NoIndexIndexer
-logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.level=fatal
-
-logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.name=org.alfresco.repo.search.impl.noindex.NoIndexSearchService
-logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.level=fatal
-
-# lucene index warnings
-logger.alfresco-repo-search-impl-lucene-index-IndexInfo.name=org.alfresco.repo.search.impl.lucene.index.IndexInfo
-logger.alfresco-repo-search-impl-lucene-index-IndexInfo.level=warn
-
-# Warn about RMI socket bind retries.
-logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.name=org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory
-logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.level=warn
-
-logger.alfresco-repo-usage-RepoUsageMonitor.name=org.alfresco.repo.usage.RepoUsageMonitor
-logger.alfresco-repo-usage-RepoUsageMonitor.level=info
-
-# identity service authentication
-logger.alfresco-repo-security-authentication-identityservice.name=org.alfresco.repo.security.authentication.identityservice
-logger.alfresco-repo-security-authentication-identityservice.level=debug
-
-logger.keycloak.name=org.keycloak
-logger.keycloak.level=debug
-
-# Renditions and Transforms
-logger.alfresco-repo-content-transform-TransformerDebug.name=org.alfresco.repo.content.transform.TransformerDebug
-logger.alfresco-repo-content-transform-TransformerDebug.level=debug
-
-logger.alfresco-repo-rendition2.name=org.alfresco.repo.rendition2
-logger.alfresco-repo-rendition2.level=debug
-
-logger.alfresco-repo-thumbnail-ThumbnailServiceImplTest.name=org.alfresco.repo.thumbnail.ThumbnailServiceImplTest
-logger.alfresco-repo-thumbnail-ThumbnailServiceImplTest.level=debug
-
-logger.alfresco-repo-rendition2-RenditionService2Impl.name=org.alfresco.repo.rendition2.RenditionService2Impl
-logger.alfresco-repo-rendition2-RenditionService2Impl.level=debug