[322552] Provide a callback which informs about replication progress

https://bugs.eclipse.org/bugs/show_bug.cgi?id=322552

4 files changed, 16 insertions, 20 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF
index f1929d161e..f7e4003433 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF
@@ -11,13 +11,13 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.server.internal.objectivity;version="4.0.0",
- org.eclipse.emf.cdo.server.internal.objectivity.bundle;version="4.0.0",
- org.eclipse.emf.cdo.server.internal.objectivity.clustering;version="4.0.0",
- org.eclipse.emf.cdo.server.internal.objectivity.db;version="4.0.0",
- org.eclipse.emf.cdo.server.internal.objectivity.mapper;version="4.0.0",
- org.eclipse.emf.cdo.server.internal.objectivity.schema;version="4.0.0",
- org.eclipse.emf.cdo.server.internal.objectivity.utils;version="4.0.0",
+Export-Package: org.eclipse.emf.cdo.server.internal.objectivity;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.bundle;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.clustering;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.db;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.mapper;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.schema;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.utils;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
  org.eclipse.emf.cdo.server.objectivity;version="4.0.0"
 Import-Package: com.objy.as;version="[3.0.0,4.0.0)",
  com.objy.as.app;version="[3.0.0,4.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
index fbb8f5bc41..ab61ce12dd 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
@@ -1231,8 +1231,11 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     throw new UnsupportedOperationException();
   }
 
-  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime)
-      throws IOException
+  /**
+   * @since 4.0
+   */
+  public void rawImport(CDODataInput in, int fromBranchID, int toBranchID, long fromCommitTime, long toCommitTime,
+      OMMonitor monitor) throws IOException
   {
     throw new UnsupportedOperationException();
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java
index 94cbd8a955..49483a6b8f 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.server.IStoreAccessor;
 import org.eclipse.emf.cdo.server.internal.objectivity.db.ObjyObject;
-import org.eclipse.emf.cdo.server.objectivity.IObjectivityStoreAccessor;
 import org.eclipse.emf.cdo.server.objectivity.IObjectivityStoreChunkReader;
 import org.eclipse.emf.cdo.spi.server.StoreChunkReader;
 
@@ -25,7 +24,6 @@ import java.util.List;
 
 public class ObjectivityStoreChunkReader extends StoreChunkReader implements IObjectivityStoreChunkReader
 {
-
   public ObjectivityStoreChunkReader(IStoreAccessor accessor, CDORevision revision, EStructuralFeature feature)
   {
     super(accessor, revision, feature);
@@ -33,9 +31,9 @@ public class ObjectivityStoreChunkReader extends StoreChunkReader implements IOb
   }
 
   @Override
-  public IObjectivityStoreAccessor getAccessor()
+  public ObjectivityStoreAccessor getAccessor()
   {
-    return (IObjectivityStoreAccessor)super.getAccessor();
+    return (ObjectivityStoreAccessor)super.getAccessor();
   }
 
   public List<Chunk> executeRead()
@@ -52,8 +50,7 @@ public class ObjectivityStoreChunkReader extends StoreChunkReader implements IOb
       int chunkSize = chunk.size();
 
       // get the data from the feature.
-      Object[] objects = objyRevision.fetch((ObjectivityStoreAccessor)getAccessor(), getFeature(), chunkStartIndex,
-          chunkSize);
+      Object[] objects = objyRevision.fetch(getAccessor(), getFeature(), chunkStartIndex, chunkSize);
       // although we asked for a chunkSize we might get less.
       for (int i = 0; i < objects.length; i++)
       {
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/IObjectivityStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/IObjectivityStoreAccessor.java
index 50f956d7fc..b0588931ea 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/IObjectivityStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/IObjectivityStoreAccessor.java
@@ -4,16 +4,14 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
  */
 package org.eclipse.emf.cdo.server.objectivity;
 
-import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.server.IStoreAccessor;
-import org.eclipse.emf.cdo.server.internal.objectivity.db.ObjyObject;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
 
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -29,6 +27,4 @@ public interface IObjectivityStoreAccessor extends IStoreAccessor
    * @since 2.0
    */
   public IObjectivityStoreChunkReader createChunkReader(InternalCDORevision revision, EStructuralFeature feature);
-
-  public ObjyObject getObject(CDOID cdoId);
 }