From 6fd997a096b882f7f1b9aaaf982ea74de741beca Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Tue, 1 Jul 2014 15:31:01 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    75082:
 Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       73269: Renamed
 ContentReadEvent to ContentEventImpl

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/opencmis/CMISConnector.java      | 5 +++--
 .../org/alfresco/opencmis/OpenCmisLocalTest.java          | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java
index 14b7e83073..c6c8d9ece0 100644
--- a/source/java/org/alfresco/opencmis/CMISConnector.java
+++ b/source/java/org/alfresco/opencmis/CMISConnector.java
@@ -49,7 +49,8 @@ import javax.xml.datatype.DatatypeFactory;
 
 import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.events.types.ContentReadEvent;
+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.model.ContentModel;
@@ -1725,7 +1726,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
                 } 
                 else 
                 {
-                    return new ContentReadEvent(ContentReadEvent.DOWNLOAD, user, networkId, transactionId,
+                    return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId,
                                 nodeRef.getId(), null, nodeType.toString(), Client.cmis, mimeType, contentSize, encoding);            
                 }
             }
diff --git a/source/test-java/org/alfresco/opencmis/OpenCmisLocalTest.java b/source/test-java/org/alfresco/opencmis/OpenCmisLocalTest.java
index aa0407c3c9..57efbc79da 100644
--- a/source/test-java/org/alfresco/opencmis/OpenCmisLocalTest.java
+++ b/source/test-java/org/alfresco/opencmis/OpenCmisLocalTest.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import junit.framework.TestCase;
 
-import org.alfresco.events.types.ContentReadEvent;
+import org.alfresco.events.types.ContentEventImpl;
 import org.alfresco.events.types.ContentReadRangeEvent;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.filestore.FileContentWriter;
@@ -206,10 +206,10 @@ public class OpenCmisLocalTest extends TestCase
         //range request
         content = doc1.getContentStream(BigInteger.valueOf(2),BigInteger.valueOf(4));
         assertNotNull(content);
-        List<ContentReadEvent> events = eventPublisher.getQueueByType(ContentReadEvent.class);
+        List<ContentEventImpl> events = eventPublisher.getQueueByType(ContentEventImpl.class);
         int found = 0;
         
-        for (ContentReadEvent cre : events)
+        for (ContentEventImpl cre : events)
         {
            if (doc1NodeRef.getId().equals(cre.getNodeId()))
            {
@@ -237,7 +237,7 @@ public class OpenCmisLocalTest extends TestCase
         
     }
 
-    private void commonAsserts(byte[] byteContent,ContentReadEvent cre)
+    private void commonAsserts(byte[] byteContent,ContentEventImpl cre)
     {
         assertEquals(Client.cmis, cre.getClient());
         assertEquals(byteContent.length, cre.getSize());