diff --git a/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.puml b/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.puml index 840244dd36..60d377c4fc 100644 --- a/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.puml +++ b/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.puml @@ -731,7 +731,7 @@ interface javax.servlet.ServletConfig { + getServletName() : String } -interface org.alfresco.repo.events.EventPreparator { +interface org.alfresco.sync.repo.events.EventPreparator { -- + prepareEvent(c String, c String, c String) : Event @@ -1503,7 +1503,7 @@ org.alfresco.repo.webdav.WebDAV "1" o-left- "1" org.apache.commons.logging.Log org.alfresco.repo.webdav.WebDAVMethod "1" o-left- "1" org.alfresco.service.cmr.repository.NodeRef : m_rootNodeRef: c NodeRef org.alfresco.repo.webdav.WebDAVHelper "1" o-left- "1" org.alfresco.repo.policy.BehaviourFilter : m_policyBehaviourFilter: i BehaviourFilter org.alfresco.repo.webdav.MTNodesCache2 "1" o-left- "1" org.alfresco.service.cmr.repository.NodeRef : defaultNode: c NodeRef -org.alfresco.repo.webdav.WebDAVHelper "1" o-left- "1" org.alfresco.repo.events.EventPublisher : eventPublisher: i EventPublisher +org.alfresco.repo.webdav.WebDAVHelper "1" o-left- "1" org.alfresco.sync.repo.events.EventPublisher : eventPublisher: i EventPublisher org.alfresco.repo.webdav.WebDAVHelper "1" o-left- "1" org.apache.commons.logging.Log : logger: i Log org.alfresco.repo.webdav.ExceptionHandler "1" o-left- "1" javax.servlet.http.HttpServletRequest : request: i HttpServletRequest org.alfresco.repo.webdav.WebDAVServlet "1" o-left- "1" org.alfresco.repo.tenant.TenantService : tenantService: i TenantService diff --git a/pom.xml b/pom.xml index f23d0fca54..1bf948ba8c 100644 --- a/pom.xml +++ b/pom.xml @@ -753,8 +753,8 @@ org.alfresco - alfresco-repository-events - 1.2.13 + alfresco-sync-events + 1.2.14 org.gytheio diff --git a/src/main/java/org/alfresco/opencmis/ActivityPosterImpl.java b/src/main/java/org/alfresco/opencmis/ActivityPosterImpl.java index 7f54b06c21..cf04bd259c 100644 --- a/src/main/java/org/alfresco/opencmis/ActivityPosterImpl.java +++ b/src/main/java/org/alfresco/opencmis/ActivityPosterImpl.java @@ -1,39 +1,39 @@ -/* - * #%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 . - * #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 . + * #L% + */ package org.alfresco.opencmis; import java.util.List; import org.alfresco.model.ContentModel; -import org.alfresco.repo.Client; -import org.alfresco.repo.Client.ClientType; +import org.alfresco.sync.repo.Client; +import org.alfresco.sync.repo.Client.ClientType; import org.alfresco.repo.activities.ActivityType; import org.alfresco.repo.model.filefolder.HiddenAspect; import org.alfresco.repo.tenant.TenantService; -import org.alfresco.service.cmr.activities.ActivityInfo; +import org.alfresco.service.cmr.activities.ActivityInfo; import org.alfresco.service.cmr.activities.ActivityPoster; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileFolderServiceType; diff --git a/src/main/java/org/alfresco/opencmis/CMISConnector.java b/src/main/java/org/alfresco/opencmis/CMISConnector.java index 695188c4e9..318e566fcd 100644 --- a/src/main/java/org/alfresco/opencmis/CMISConnector.java +++ b/src/main/java/org/alfresco/opencmis/CMISConnector.java @@ -55,10 +55,10 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.events.types.ContentEvent; -import org.alfresco.events.types.ContentEventImpl; -import org.alfresco.events.types.ContentReadRangeEvent; -import org.alfresco.events.types.Event; +import org.alfresco.sync.events.types.ContentEvent; +import org.alfresco.sync.events.types.ContentEventImpl; +import org.alfresco.sync.events.types.ContentReadRangeEvent; +import org.alfresco.sync.events.types.Event; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.activities.ActivityInfo; import org.alfresco.opencmis.dictionary.CMISActionEvaluator; @@ -78,13 +78,13 @@ import org.alfresco.opencmis.search.CMISQueryService; import org.alfresco.opencmis.search.CMISResultSet; import org.alfresco.opencmis.search.CMISResultSetColumn; import org.alfresco.opencmis.search.CMISResultSetRow; -import org.alfresco.repo.Client; -import org.alfresco.repo.Client.ClientType; +import org.alfresco.sync.repo.Client; +import org.alfresco.sync.repo.Client.ClientType; import org.alfresco.repo.action.executer.ContentMetadataExtracter; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.coci.CheckOutCheckInServiceImpl; -import org.alfresco.repo.events.EventPreparator; -import org.alfresco.repo.events.EventPublisher; +import org.alfresco.sync.repo.events.EventPreparator; +import org.alfresco.sync.repo.events.EventPublisher; import org.alfresco.repo.model.filefolder.GetChildrenCannedQuery; import org.alfresco.repo.model.filefolder.HiddenAspect; import org.alfresco.repo.model.filefolder.HiddenAspect.Visibility; diff --git a/src/main/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java b/src/main/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java index cc1d812eac..946c0f8a8e 100644 --- a/src/main/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java +++ b/src/main/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java @@ -1,28 +1,28 @@ -/* - * #%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 . - * #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 . + * #L% + */ package org.alfresco.repo.activities; import java.sql.SQLException; @@ -32,14 +32,14 @@ import java.util.Date; import java.util.List; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.events.types.ActivityEvent; -import org.alfresco.events.types.Event; -import org.alfresco.repo.Client; +import org.alfresco.sync.events.types.ActivityEvent; +import org.alfresco.sync.events.types.Event; +import org.alfresco.sync.repo.Client; import org.alfresco.repo.activities.post.lookup.PostLookup; import org.alfresco.repo.domain.activities.ActivityPostDAO; import org.alfresco.repo.domain.activities.ActivityPostEntity; -import org.alfresco.repo.events.EventPreparator; -import org.alfresco.repo.events.EventPublisher; +import org.alfresco.sync.repo.events.EventPreparator; +import org.alfresco.sync.repo.events.EventPublisher; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.activities.ActivityPostService; diff --git a/src/main/java/org/alfresco/repo/activities/ActivityServiceImpl.java b/src/main/java/org/alfresco/repo/activities/ActivityServiceImpl.java index a8cd010b7f..c27bd3bf6a 100644 --- a/src/main/java/org/alfresco/repo/activities/ActivityServiceImpl.java +++ b/src/main/java/org/alfresco/repo/activities/ActivityServiceImpl.java @@ -1,28 +1,28 @@ -/* - * #%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 . - * #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 . + * #L% + */ package org.alfresco.repo.activities; import java.sql.SQLException; @@ -36,7 +36,7 @@ import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; -import org.alfresco.repo.Client; +import org.alfresco.sync.repo.Client; import org.alfresco.repo.activities.feed.cleanup.FeedCleaner; import org.alfresco.repo.domain.activities.ActivityFeedDAO; import org.alfresco.repo.domain.activities.ActivityFeedEntity; diff --git a/src/main/java/org/alfresco/repo/activities/script/Activity.java b/src/main/java/org/alfresco/repo/activities/script/Activity.java index 681b4bd48f..82b79065e1 100644 --- a/src/main/java/org/alfresco/repo/activities/script/Activity.java +++ b/src/main/java/org/alfresco/repo/activities/script/Activity.java @@ -1,34 +1,34 @@ -/* - * #%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 . - * #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 . + * #L% + */ package org.alfresco.repo.activities.script; import java.util.List; -import org.alfresco.repo.Client; -import org.alfresco.repo.Client.ClientType; +import org.alfresco.sync.repo.Client; +import org.alfresco.sync.repo.Client.ClientType; import org.alfresco.repo.jscript.BaseScopableProcessorExtension; import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.activities.ActivityService; diff --git a/src/main/java/org/alfresco/repo/events/AbstractEventsService.java b/src/main/java/org/alfresco/repo/events/AbstractEventsService.java index e992581f15..0ce908ff10 100644 --- a/src/main/java/org/alfresco/repo/events/AbstractEventsService.java +++ b/src/main/java/org/alfresco/repo/events/AbstractEventsService.java @@ -39,13 +39,13 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; -import org.alfresco.events.EventRegistry; -import org.alfresco.events.types.Event; -import org.alfresco.events.types.TransactionCommittedEvent; -import org.alfresco.events.types.TransactionRolledBackEvent; +import org.alfresco.sync.events.EventRegistry; +import org.alfresco.sync.events.types.Event; +import org.alfresco.sync.events.types.TransactionCommittedEvent; +import org.alfresco.sync.events.types.TransactionRolledBackEvent; import org.alfresco.model.ContentModel; import org.alfresco.opencmis.AlfrescoCmisServiceCall; -import org.alfresco.repo.Client; +import org.alfresco.sync.repo.Client; import org.alfresco.repo.model.filefolder.HiddenAspect; import org.alfresco.repo.model.filefolder.HiddenAspect.Visibility; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/src/main/java/org/alfresco/repo/events/ClientUtil.java b/src/main/java/org/alfresco/repo/events/ClientUtil.java index 84c9646eb8..8da23ff9e6 100644 --- a/src/main/java/org/alfresco/repo/events/ClientUtil.java +++ b/src/main/java/org/alfresco/repo/events/ClientUtil.java @@ -25,12 +25,12 @@ */ package org.alfresco.repo.events; -import org.alfresco.repo.Client.ClientType; +import org.alfresco.sync.repo.Client.ClientType; import org.alfresco.util.FileFilterMode; /** - * Allows us to convert between a FileFilterMode.Client and org.alfresco.events.Client. - * This is a one way conversion. org.alfresco.events.Client may evolve independently + * Allows us to convert between a FileFilterMode.Client and org.alfresco.sync.events.Client. + * This is a one way conversion. org.alfresco.sync.events.Client may evolve independently * from FileFilterMode.Client, ie. there's a "from" method but no "to" method. * * @author Gethin James @@ -40,16 +40,16 @@ public class ClientUtil /** * If a new client is added to the FileFilterMode.Client then the unit test will * throw a IllegalArgument exception. To fix it you will need to add to the - * org.alfresco.events.Client.ClientType. + * org.alfresco.sync.events.Client.ClientType. * * @param from FileFilterMode.Client - * @return org.alfresco.events.Client + * @return org.alfresco.sync.events.Client */ - public static org.alfresco.repo.Client from(FileFilterMode.Client from) + public static org.alfresco.sync.repo.Client from(FileFilterMode.Client from) { if (from == null) return null; - ClientType type = org.alfresco.repo.Client.ClientType.valueOf(from.toString()); - return org.alfresco.repo.Client.asType(type); + ClientType type = org.alfresco.sync.repo.Client.ClientType.valueOf(from.toString()); + return org.alfresco.sync.repo.Client.asType(type); } // public static FileFilterMode.Client to(org.alfresco.events.Client from) diff --git a/src/main/java/org/alfresco/repo/events/EventGenerationBehaviours.java b/src/main/java/org/alfresco/repo/events/EventGenerationBehaviours.java index c3ed9fcb45..35cbb764ba 100644 --- a/src/main/java/org/alfresco/repo/events/EventGenerationBehaviours.java +++ b/src/main/java/org/alfresco/repo/events/EventGenerationBehaviours.java @@ -34,30 +34,30 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.alfresco.events.types.DataType; -import org.alfresco.events.types.NodeAddedEvent; -import org.alfresco.events.types.NodeCheckOutCancelledEvent; -import org.alfresco.events.types.NodeCheckedInEvent; -import org.alfresco.events.types.NodeCheckedOutEvent; -import org.alfresco.events.types.NodeContentGetEvent; -import org.alfresco.events.types.NodeContentPutEvent; -import org.alfresco.events.types.NodeLockedEvent; -import org.alfresco.events.types.NodeMovedEvent; -import org.alfresco.events.types.NodeRemovedEvent; -import org.alfresco.events.types.NodeUnlockedEvent; -import org.alfresco.events.types.NodeUpdatedEvent; -import org.alfresco.events.types.Property; -import org.alfresco.events.types.authority.AuthorityAddedToGroupEvent; -import org.alfresco.events.types.authority.AuthorityRemovedFromGroupEvent; -import org.alfresco.events.types.authority.GroupDeletedEvent; -import org.alfresco.events.types.permission.InheritPermissionsDisabledEvent; -import org.alfresco.events.types.permission.InheritPermissionsEnabledEvent; -import org.alfresco.events.types.permission.LocalPermissionGrantedEvent; -import org.alfresco.events.types.permission.LocalPermissionRevokedEvent; -import org.alfresco.events.types.recordsmanagement.FileClassifiedEvent; -import org.alfresco.events.types.recordsmanagement.FileUnclassifiedEvent; -import org.alfresco.events.types.recordsmanagement.RecordCreatedEvent; -import org.alfresco.events.types.recordsmanagement.RecordRejectedEvent; +import org.alfresco.sync.events.types.DataType; +import org.alfresco.sync.events.types.NodeAddedEvent; +import org.alfresco.sync.events.types.NodeCheckOutCancelledEvent; +import org.alfresco.sync.events.types.NodeCheckedInEvent; +import org.alfresco.sync.events.types.NodeCheckedOutEvent; +import org.alfresco.sync.events.types.NodeContentGetEvent; +import org.alfresco.sync.events.types.NodeContentPutEvent; +import org.alfresco.sync.events.types.NodeLockedEvent; +import org.alfresco.sync.events.types.NodeMovedEvent; +import org.alfresco.sync.events.types.NodeRemovedEvent; +import org.alfresco.sync.events.types.NodeUnlockedEvent; +import org.alfresco.sync.events.types.NodeUpdatedEvent; +import org.alfresco.sync.events.types.Property; +import org.alfresco.sync.events.types.authority.AuthorityAddedToGroupEvent; +import org.alfresco.sync.events.types.authority.AuthorityRemovedFromGroupEvent; +import org.alfresco.sync.events.types.authority.GroupDeletedEvent; +import org.alfresco.sync.events.types.permission.InheritPermissionsDisabledEvent; +import org.alfresco.sync.events.types.permission.InheritPermissionsEnabledEvent; +import org.alfresco.sync.events.types.permission.LocalPermissionGrantedEvent; +import org.alfresco.sync.events.types.permission.LocalPermissionRevokedEvent; +import org.alfresco.sync.events.types.recordsmanagement.FileClassifiedEvent; +import org.alfresco.sync.events.types.recordsmanagement.FileUnclassifiedEvent; +import org.alfresco.sync.events.types.recordsmanagement.RecordCreatedEvent; +import org.alfresco.sync.events.types.recordsmanagement.RecordRejectedEvent; import org.alfresco.model.ContentModel; import org.alfresco.repo.coci.CheckOutCheckInServicePolicies; import org.alfresco.repo.content.ContentServicePolicies; diff --git a/src/main/java/org/alfresco/repo/events/EventsService.java b/src/main/java/org/alfresco/repo/events/EventsService.java index 38e478910c..01c5b965bc 100644 --- a/src/main/java/org/alfresco/repo/events/EventsService.java +++ b/src/main/java/org/alfresco/repo/events/EventsService.java @@ -28,7 +28,7 @@ package org.alfresco.repo.events; import java.util.Map; import java.util.Set; -import org.alfresco.events.types.Property; +import org.alfresco.sync.events.types.Property; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/src/main/java/org/alfresco/repo/events/EventsServiceImpl.java b/src/main/java/org/alfresco/repo/events/EventsServiceImpl.java index 864c0752c8..bbd89f574e 100644 --- a/src/main/java/org/alfresco/repo/events/EventsServiceImpl.java +++ b/src/main/java/org/alfresco/repo/events/EventsServiceImpl.java @@ -36,40 +36,40 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.alfresco.events.types.Event; -import org.alfresco.events.types.NodeAddedEvent; -import org.alfresco.events.types.NodeCheckOutCancelledEvent; -import org.alfresco.events.types.NodeCheckedInEvent; -import org.alfresco.events.types.NodeCheckedOutEvent; -import org.alfresco.events.types.NodeCommentedEvent; -import org.alfresco.events.types.NodeContentGetEvent; -import org.alfresco.events.types.NodeContentPutEvent; -import org.alfresco.events.types.NodeFavouritedEvent; -import org.alfresco.events.types.NodeLikedEvent; -import org.alfresco.events.types.NodeLockedEvent; -import org.alfresco.events.types.NodeMovedEvent; -import org.alfresco.events.types.NodeRemovedEvent; -import org.alfresco.events.types.NodeRenamedEvent; -import org.alfresco.events.types.NodeTaggedEvent; -import org.alfresco.events.types.NodeUnFavouritedEvent; -import org.alfresco.events.types.NodeUnLikedEvent; -import org.alfresco.events.types.NodeUnTaggedEvent; -import org.alfresco.events.types.NodeUnlockedEvent; -import org.alfresco.events.types.NodeUpdatedEvent; -import org.alfresco.events.types.Property; -import org.alfresco.events.types.authority.AuthorityAddedToGroupEvent; -import org.alfresco.events.types.authority.AuthorityRemovedFromGroupEvent; -import org.alfresco.events.types.authority.GroupDeletedEvent; -import org.alfresco.events.types.permission.InheritPermissionsDisabledEvent; -import org.alfresco.events.types.permission.InheritPermissionsEnabledEvent; -import org.alfresco.events.types.permission.LocalPermissionGrantedEvent; -import org.alfresco.events.types.permission.LocalPermissionRevokedEvent; -import org.alfresco.events.types.recordsmanagement.FileClassifiedEvent; -import org.alfresco.events.types.recordsmanagement.FileUnclassifiedEvent; -import org.alfresco.events.types.recordsmanagement.RecordCreatedEvent; -import org.alfresco.events.types.recordsmanagement.RecordRejectedEvent; +import org.alfresco.sync.events.types.Event; +import org.alfresco.sync.events.types.NodeAddedEvent; +import org.alfresco.sync.events.types.NodeCheckOutCancelledEvent; +import org.alfresco.sync.events.types.NodeCheckedInEvent; +import org.alfresco.sync.events.types.NodeCheckedOutEvent; +import org.alfresco.sync.events.types.NodeCommentedEvent; +import org.alfresco.sync.events.types.NodeContentGetEvent; +import org.alfresco.sync.events.types.NodeContentPutEvent; +import org.alfresco.sync.events.types.NodeFavouritedEvent; +import org.alfresco.sync.events.types.NodeLikedEvent; +import org.alfresco.sync.events.types.NodeLockedEvent; +import org.alfresco.sync.events.types.NodeMovedEvent; +import org.alfresco.sync.events.types.NodeRemovedEvent; +import org.alfresco.sync.events.types.NodeRenamedEvent; +import org.alfresco.sync.events.types.NodeTaggedEvent; +import org.alfresco.sync.events.types.NodeUnFavouritedEvent; +import org.alfresco.sync.events.types.NodeUnLikedEvent; +import org.alfresco.sync.events.types.NodeUnTaggedEvent; +import org.alfresco.sync.events.types.NodeUnlockedEvent; +import org.alfresco.sync.events.types.NodeUpdatedEvent; +import org.alfresco.sync.events.types.Property; +import org.alfresco.sync.events.types.authority.AuthorityAddedToGroupEvent; +import org.alfresco.sync.events.types.authority.AuthorityRemovedFromGroupEvent; +import org.alfresco.sync.events.types.authority.GroupDeletedEvent; +import org.alfresco.sync.events.types.permission.InheritPermissionsDisabledEvent; +import org.alfresco.sync.events.types.permission.InheritPermissionsEnabledEvent; +import org.alfresco.sync.events.types.permission.LocalPermissionGrantedEvent; +import org.alfresco.sync.events.types.permission.LocalPermissionRevokedEvent; +import org.alfresco.sync.events.types.recordsmanagement.FileClassifiedEvent; +import org.alfresco.sync.events.types.recordsmanagement.FileUnclassifiedEvent; +import org.alfresco.sync.events.types.recordsmanagement.RecordCreatedEvent; +import org.alfresco.sync.events.types.recordsmanagement.RecordRejectedEvent; import org.alfresco.model.ContentModel; -import org.alfresco.repo.Client; +import org.alfresco.sync.repo.Client; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.site.SiteModel; import org.alfresco.repo.tenant.TenantUtil; diff --git a/src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java b/src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java index 57f2df238c..a683be3b18 100644 --- a/src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java +++ b/src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java @@ -25,7 +25,7 @@ */ package org.alfresco.repo.events; -import org.alfresco.events.types.ExceptionGeneratedEvent; +import org.alfresco.sync.events.types.ExceptionGeneratedEvent; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.tenant.TenantUtil; import org.apache.commons.logging.Log; diff --git a/src/main/java/org/alfresco/repo/favourites/FavouritesServiceImpl.java b/src/main/java/org/alfresco/repo/favourites/FavouritesServiceImpl.java index 59491c8f07..6f57e1e5ab 100644 --- a/src/main/java/org/alfresco/repo/favourites/FavouritesServiceImpl.java +++ b/src/main/java/org/alfresco/repo/favourites/FavouritesServiceImpl.java @@ -1,28 +1,28 @@ -/* - * #%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 . - * #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 . + * #L% + */ package org.alfresco.repo.favourites; import java.io.Serializable; @@ -40,16 +40,16 @@ import java.util.StringTokenizer; import java.util.TreeMap; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.events.types.ActivityEvent; -import org.alfresco.events.types.Event; +import org.alfresco.sync.events.types.ActivityEvent; +import org.alfresco.sync.events.types.Event; import org.alfresco.model.ContentModel; import org.alfresco.query.PageDetails; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; -import org.alfresco.repo.Client; -import org.alfresco.repo.Client.ClientType; -import org.alfresco.repo.events.EventPreparator; -import org.alfresco.repo.events.EventPublisher; +import org.alfresco.sync.repo.Client; +import org.alfresco.sync.repo.Client.ClientType; +import org.alfresco.sync.repo.events.EventPreparator; +import org.alfresco.sync.repo.events.EventPublisher; import org.alfresco.repo.favourites.PersonFavourite.PersonFavouriteKey; import org.alfresco.repo.policy.ClassPolicy; import org.alfresco.repo.policy.ClassPolicyDelegate; diff --git a/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java b/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java index 51d5e73b63..2102a2bf93 100644 --- a/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java +++ b/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java @@ -37,12 +37,12 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.alfresco.events.types.ActivityEvent; -import org.alfresco.events.types.Event; +import org.alfresco.sync.events.types.ActivityEvent; +import org.alfresco.sync.events.types.Event; import org.alfresco.model.ContentModel; import org.alfresco.model.QuickShareModel; -import org.alfresco.repo.Client; -import org.alfresco.repo.Client.ClientType; +import org.alfresco.sync.repo.Client; +import org.alfresco.sync.repo.Client.ClientType; import org.alfresco.repo.action.executer.MailActionExecuter; import org.alfresco.repo.admin.SysAdminParams; import org.alfresco.repo.client.config.ClientAppConfig; @@ -51,8 +51,8 @@ import org.alfresco.repo.copy.CopyBehaviourCallback; import org.alfresco.repo.copy.CopyDetails; import org.alfresco.repo.copy.CopyServicePolicies; import org.alfresco.repo.copy.DoNothingCopyBehaviourCallback; -import org.alfresco.repo.events.EventPreparator; -import org.alfresco.repo.events.EventPublisher; +import org.alfresco.sync.repo.events.EventPreparator; +import org.alfresco.sync.repo.events.EventPublisher; import org.alfresco.repo.node.NodeServicePolicies; import org.alfresco.repo.policy.BehaviourFilter; import org.alfresco.repo.policy.JavaBehaviour; diff --git a/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java index 773f62b13d..036ae098a9 100644 --- a/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java +++ b/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java @@ -39,8 +39,8 @@ import java.util.Set; import java.util.StringTokenizer; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.events.types.Event; -import org.alfresco.events.types.UserManagementEvent; +import org.alfresco.sync.events.types.Event; +import org.alfresco.sync.events.types.UserManagementEvent; import org.alfresco.model.ContentModel; import org.alfresco.query.CannedQueryFactory; import org.alfresco.query.CannedQueryResults; @@ -50,8 +50,8 @@ import org.alfresco.repo.action.executer.MailActionExecuter; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.cache.TransactionalCache; import org.alfresco.repo.domain.permissions.AclDAO; -import org.alfresco.repo.events.EventPreparator; -import org.alfresco.repo.events.EventPublisher; +import org.alfresco.sync.repo.events.EventPreparator; +import org.alfresco.sync.repo.events.EventPublisher; import org.alfresco.repo.node.NodeServicePolicies; import org.alfresco.repo.node.NodeServicePolicies.BeforeCreateNodePolicy; import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy; diff --git a/src/main/java/org/alfresco/repo/site/SiteServiceImpl.java b/src/main/java/org/alfresco/repo/site/SiteServiceImpl.java index 6a60e5b4b7..9d4aecc13e 100644 --- a/src/main/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/src/main/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -43,8 +43,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.events.types.Event; -import org.alfresco.events.types.SiteManagementEvent; +import org.alfresco.sync.events.types.Event; +import org.alfresco.sync.events.types.SiteManagementEvent; import org.alfresco.model.ContentModel; import org.alfresco.query.CannedQuery; import org.alfresco.query.CannedQueryFactory; @@ -60,8 +60,8 @@ import org.alfresco.repo.activities.ActivityType; import org.alfresco.repo.admin.SysAdminParams; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.domain.node.NodeDAO; -import org.alfresco.repo.events.EventPreparator; -import org.alfresco.repo.events.EventPublisher; +import org.alfresco.sync.repo.events.EventPreparator; +import org.alfresco.sync.repo.events.EventPublisher; import org.alfresco.repo.node.NodeArchiveServicePolicies; import org.alfresco.repo.node.NodeArchiveServicePolicies.BeforePurgeNodePolicy; import org.alfresco.repo.node.NodeArchiveServicePolicies.BeforeRestoreArchivedNodePolicy; diff --git a/src/main/java/org/alfresco/service/cmr/activities/ActivitiesTransactionListener.java b/src/main/java/org/alfresco/service/cmr/activities/ActivitiesTransactionListener.java index 678182ef09..ba4224d09b 100644 --- a/src/main/java/org/alfresco/service/cmr/activities/ActivitiesTransactionListener.java +++ b/src/main/java/org/alfresco/service/cmr/activities/ActivitiesTransactionListener.java @@ -25,7 +25,7 @@ */ package org.alfresco.service.cmr.activities; -import org.alfresco.repo.Client; +import org.alfresco.sync.repo.Client; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.TransactionListener; diff --git a/src/main/java/org/alfresco/service/cmr/activities/ActivityPostService.java b/src/main/java/org/alfresco/service/cmr/activities/ActivityPostService.java index c8cfcedfb3..62af7d2a66 100644 --- a/src/main/java/org/alfresco/service/cmr/activities/ActivityPostService.java +++ b/src/main/java/org/alfresco/service/cmr/activities/ActivityPostService.java @@ -1,32 +1,32 @@ -/* - * #%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 . - * #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 . + * #L% + */ package org.alfresco.service.cmr.activities; import org.alfresco.api.AlfrescoPublicApi; -import org.alfresco.repo.Client; +import org.alfresco.sync.repo.Client; import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; diff --git a/src/main/java/org/alfresco/service/cmr/activities/ActivityPoster.java b/src/main/java/org/alfresco/service/cmr/activities/ActivityPoster.java index 35fee99cda..3007168525 100644 --- a/src/main/java/org/alfresco/service/cmr/activities/ActivityPoster.java +++ b/src/main/java/org/alfresco/service/cmr/activities/ActivityPoster.java @@ -25,7 +25,7 @@ */ package org.alfresco.service.cmr.activities; -import org.alfresco.repo.Client; +import org.alfresco.sync.repo.Client; import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/src/main/java/org/alfresco/service/cmr/activities/FileFolderActivityPosterImpl.java b/src/main/java/org/alfresco/service/cmr/activities/FileFolderActivityPosterImpl.java index d2b362f382..d2426b93a3 100644 --- a/src/main/java/org/alfresco/service/cmr/activities/FileFolderActivityPosterImpl.java +++ b/src/main/java/org/alfresco/service/cmr/activities/FileFolderActivityPosterImpl.java @@ -26,7 +26,7 @@ package org.alfresco.service.cmr.activities; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.repo.Client; +import org.alfresco.sync.repo.Client; import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/src/main/resources/alfresco/core-services-context.xml b/src/main/resources/alfresco/core-services-context.xml index 7819fe2f13..eb8cede75e 100644 --- a/src/main/resources/alfresco/core-services-context.xml +++ b/src/main/resources/alfresco/core-services-context.xml @@ -978,7 +978,7 @@ - + diff --git a/src/main/resources/alfresco/subsystems/Events/default/events-context.xml b/src/main/resources/alfresco/subsystems/Events/default/events-context.xml index edf29426c5..fa8799f9ca 100644 --- a/src/main/resources/alfresco/subsystems/Events/default/events-context.xml +++ b/src/main/resources/alfresco/subsystems/Events/default/events-context.xml @@ -14,7 +14,7 @@ - + diff --git a/src/test/java/org/alfresco/opencmis/OpenCmisLocalTest.java b/src/test/java/org/alfresco/opencmis/OpenCmisLocalTest.java index 4dfe7a4384..dfd20274b8 100644 --- a/src/test/java/org/alfresco/opencmis/OpenCmisLocalTest.java +++ b/src/test/java/org/alfresco/opencmis/OpenCmisLocalTest.java @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicInteger; import junit.framework.TestCase; -import org.alfresco.events.types.ContentEventImpl; +import org.alfresco.sync.events.types.ContentEventImpl; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.filestore.FileContentWriter; import org.alfresco.repo.domain.node.ContentDataWithId; diff --git a/src/test/java/org/alfresco/repo/events/ClientUtilTest.java b/src/test/java/org/alfresco/repo/events/ClientUtilTest.java index 24695e53ab..33126c8960 100644 --- a/src/test/java/org/alfresco/repo/events/ClientUtilTest.java +++ b/src/test/java/org/alfresco/repo/events/ClientUtilTest.java @@ -27,7 +27,7 @@ package org.alfresco.repo.events; import static org.junit.Assert.*; -import org.alfresco.repo.Client; +import org.alfresco.sync.repo.Client; import org.alfresco.util.FileFilterMode; import org.junit.Test; @@ -37,7 +37,7 @@ public class ClientUtilTest /** * If a new client is added to the FileFilterMode.Client then this unit test will * throw a IllegalArgument exception. To fix it you will need to add to the - * org.alfresco.events.Client.ClientType. + * org.alfresco.sync.events.Client.ClientType. */ @Test public void testFileFilterModeConversion() @@ -47,7 +47,7 @@ public class ClientUtilTest { equalsConversion(client); } - org.alfresco.repo.Client client = ClientUtil.from(null); + org.alfresco.sync.repo.Client client = ClientUtil.from(null); assertNull(client); } @@ -60,7 +60,7 @@ public class ClientUtilTest private void equalsConversion(FileFilterMode.Client ffSource) { - org.alfresco.repo.Client client = ClientUtil.from(ffSource); + org.alfresco.sync.repo.Client client = ClientUtil.from(ffSource); FileFilterMode.Client ffClient = to(client); assertEquals(ffSource, ffClient); } @@ -84,7 +84,7 @@ public class ClientUtilTest } */ - private static FileFilterMode.Client to(org.alfresco.repo.Client from) + private static FileFilterMode.Client to(org.alfresco.sync.repo.Client from) { FileFilterMode.Client client = FileFilterMode.Client.valueOf(from.getType().toString()); return client; diff --git a/src/test/java/org/alfresco/repo/events/EventPublisherForTestingOnly.java b/src/test/java/org/alfresco/repo/events/EventPublisherForTestingOnly.java index 4ded149c0b..730ade6772 100644 --- a/src/test/java/org/alfresco/repo/events/EventPublisherForTestingOnly.java +++ b/src/test/java/org/alfresco/repo/events/EventPublisherForTestingOnly.java @@ -1,28 +1,28 @@ -/* - * #%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 . - * #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 . + * #L% + */ package org.alfresco.repo.events; import java.util.ArrayList; @@ -30,14 +30,14 @@ import java.util.List; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import org.alfresco.events.types.BrowserEvent; -import org.alfresco.events.types.Event; +import org.alfresco.sync.events.types.Event; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.tenant.TenantUtil; import org.alfresco.repo.transaction.AlfrescoTransactionSupport; +import org.alfresco.sync.repo.events.EventPreparator; +import org.alfresco.sync.repo.events.EventPublisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.extensions.webscripts.WebScriptRequest; /** * An implementation of EventPublisher that is used for testing