[282481] Provide an EmbeddedSessionProtocol

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

2 files changed, 13 insertions, 13 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
index 05f5d867d1..303a764433 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDProvider;
 import org.eclipse.emf.cdo.common.internal.db.cache.DBRevisionCache;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
 import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
 
 import org.eclipse.net4j.db.IDBAdapter;
@@ -42,12 +42,12 @@ public final class CDOCommonDBUtil
    * @param idObjectFactory
    * @param listFactory
    * @param packageRegistry
-   * @param revisionResolver
+   * @param revisionManager
    * @param dbConnectionProvider
    */
   public static CDORevisionCache createDBCache(IDBAdapter dbAdapter, IDBConnectionProvider dbConnectionProvider,
       CDOIDProvider idProvider, CDOIDObjectFactory idObjectFactory, CDOListFactory listFactory,
-      CDOPackageRegistry packageRegistry, CDORevisionResolver revisionResolver)
+      CDOPackageRegistry packageRegistry, CDORevisionManager revisionManager)
   {
     DBRevisionCache cache = new DBRevisionCache();
     cache.setDBAdapter(dbAdapter);
@@ -56,7 +56,7 @@ public final class CDOCommonDBUtil
     cache.setIDObjectFactory(idObjectFactory);
     cache.setListFactory(listFactory);
     cache.setPackageRegistry(packageRegistry);
-    cache.setRevisionResolver(revisionResolver);
+    cache.setRevisionManager(revisionManager);
 
     return cache;
   }
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
index c7a42f566f..ae53a242c3 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.common.io.CDODataOutput;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.revision.CDOListFactory;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
 import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
 import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
 import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl;
@@ -65,7 +65,7 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
 
   private CDOPackageRegistry packageRegistry;
 
-  private CDORevisionResolver revisionResolver;
+  private CDORevisionManager revisionManager;
 
   private IDBAdapter dbAdapter;
 
@@ -115,14 +115,14 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
     this.packageRegistry = packageRegistry;
   }
 
-  public CDORevisionResolver getRevisionResolver()
+  public CDORevisionManager getRevisionManager()
   {
-    return revisionResolver;
+    return revisionManager;
   }
 
-  public void setRevisionResolver(CDORevisionResolver revisionResolver)
+  public void setRevisionManager(CDORevisionManager revisionManager)
   {
-    this.revisionResolver = revisionResolver;
+    this.revisionManager = revisionManager;
   }
 
   public IDBAdapter getDBAdapter()
@@ -722,7 +722,7 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
     checkState(idProvider, "idProvider"); //$NON-NLS-1$
     checkState(listFactory, "listFactory");//$NON-NLS-1$
     checkState(packageRegistry, "packageRegistry"); //$NON-NLS-1$
-    checkState(revisionResolver, "revisionResolver"); //$NON-NLS-1$
+    checkState(revisionManager, "revisionManager"); //$NON-NLS-1$
     checkState(dbAdapter, "dbAdapter"); //$NON-NLS-1$
     checkState(dbConnectionProvider, "dbConnectionProvider"); //$NON-NLS-1$
   }
@@ -817,9 +817,9 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
       }
 
       @Override
-      protected CDORevisionResolver getRevisionResolver()
+      protected CDORevisionManager getRevisionManager()
       {
-        return revisionResolver;
+        return revisionManager;
       }
     };
   }