Merge pull request #75 from Alfresco/feature/EGATE-52_events-package-rename

EGATE-52: Fixed the import statements of events project

pom.xml

@@ -35,7 +35,7 @@
         <dir.root>${project.build.directory}/alf_data</dir.root>
         <img.exe>convert</img.exe>
       
-        <dependency.alfresco-repository.version>7.3</dependency.alfresco-repository.version>
+        <dependency.alfresco-repository.version>7.4</dependency.alfresco-repository.version>
         <dependency.alfresco-core.version>7.3</dependency.alfresco-core.version>
         <dependency.alfresco-data-model.version>8.9</dependency.alfresco-data-model.version>
         <dependency.alfresco-pdf-renderer.version>1.1</dependency.alfresco-pdf-renderer.version>

src/main/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java

@@ -31,10 +31,10 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.events.types.Event;
+import org.alfresco.sync.events.types.Event;
-import org.alfresco.events.types.RepositoryEventImpl;
+import org.alfresco.sync.events.types.RepositoryEventImpl;
-import org.alfresco.repo.events.EventPreparator;
+import org.alfresco.sync.repo.events.EventPreparator;
-import org.alfresco.repo.events.EventPublisher;
+import org.alfresco.sync.repo.events.EventPublisher;
 import org.alfresco.repo.security.authentication.AuthenticationException;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.security.AuthenticationService;

src/main/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java

@@ -41,7 +41,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.filestore.FileContentReader;
-import org.alfresco.repo.events.EventPublisher;
+import org.alfresco.sync.repo.events.EventPublisher;
 import org.alfresco.repo.web.util.HttpRangeProcessor;
 import org.alfresco.rest.framework.resource.content.CacheDirective;
 import org.alfresco.service.cmr.repository.ContentIOException;

src/main/java/org/alfresco/repo/webdav/ActivityPosterImpl.java

@@ -28,8 +28,8 @@ package org.alfresco.repo.webdav;
 import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.Client;
+import org.alfresco.sync.repo.Client;
-import org.alfresco.repo.Client.ClientType;
+import org.alfresco.sync.repo.Client.ClientType;
 import org.alfresco.repo.activities.ActivityType;
 import org.alfresco.service.cmr.activities.ActivityPoster;
 import org.alfresco.service.cmr.model.FileInfo;

src/main/java/org/alfresco/repo/webdav/WebDAVHelper.java

@@ -39,15 +39,15 @@ import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.events.types.ContentEvent;
+import org.alfresco.sync.events.types.ContentEvent;
-import org.alfresco.events.types.ContentEventImpl;
+import org.alfresco.sync.events.types.ContentEventImpl;
-import org.alfresco.events.types.Event;
+import org.alfresco.sync.events.types.Event;
 import org.alfresco.jlan.util.IPAddress;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.Client;
+import org.alfresco.sync.repo.Client;
-import org.alfresco.repo.Client.ClientType;
+import org.alfresco.sync.repo.Client.ClientType;
-import org.alfresco.repo.events.EventPreparator;
+import org.alfresco.sync.repo.events.EventPreparator;
-import org.alfresco.repo.events.EventPublisher;
+import org.alfresco.sync.repo.events.EventPublisher;
 import org.alfresco.repo.lock.LockUtils;
 import org.alfresco.repo.model.filefolder.HiddenAspect;
 import org.alfresco.repo.policy.BehaviourFilter;

src/main/java/org/alfresco/rest/api/Activities.java

@@ -27,7 +27,7 @@ package org.alfresco.rest.api;
 
 import java.util.Map;
 
-import org.alfresco.repo.Client;
+import org.alfresco.sync.repo.Client;
 import org.alfresco.repo.domain.activities.ActivityFeedEntity;
 import org.alfresco.rest.api.model.Activity;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;

src/main/java/org/alfresco/rest/api/impl/node/ratings/AbstractRatingScheme.java

@@ -30,7 +30,7 @@ import java.net.URLEncoder;
 import java.util.Date;
 
 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.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.rest.api.model.DocumentRatingSummary;

src/test/java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.alfresco.repo.dictionary.CustomModelServiceImpl;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.rest.api.model.AbstractClassModel;
@@ -96,14 +97,12 @@ public class BaseCustomModelApiTest extends AbstractBaseApiTest
         users.add(customModelAdmin);
 
         // Add 'customModelAdmin' user into 'ALFRESCO_MODEL_ADMINISTRATORS' group
-        transactionHelper.doInTransaction(new RetryingTransactionCallback<Void>()
+        AuthenticationUtil.runAsSystem((RunAsWork<Void>) () -> {
-        {
+            transactionHelper.doInTransaction((RetryingTransactionCallback<Void>) () -> {
-            @Override
-            public Void execute() throws Throwable
-            {
                 authorityService.addAuthority(CustomModelServiceImpl.GROUP_ALFRESCO_MODEL_ADMINISTRATORS_AUTHORITY, customModelAdmin);
                 return null;
-            }
+            });
+            return null;
         });
     }