*** empty log message ***

14 files changed, 35 insertions, 36 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDMapper.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java
index effe8c85c5..f588a50058 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOIDMapper.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/CDOIDMapper.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Simon McDuff - initial API and implementation
  **************************************************************************/
-package org.eclipse.emf.cdo.internal.common.revision;
+package org.eclipse.emf.cdo.spi.common.revision;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.id.CDOIDTemp;
@@ -19,6 +19,7 @@ import java.util.Map;
 
 /**
  * @author Simon McDuff
+ * @since 2.0
  */
 public class CDOIDMapper implements CDOReferenceAdjuster
 {
diff --git a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
index 810e9f5786..a492541c0d 100644
--- a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters
@@ -125,12 +125,6 @@
                 <message_argument value="TransactionPackageManager"/>
             </message_arguments>
         </filter>
-        <filter id="574619656">
-            <message_arguments>
-                <message_argument value="CDOPackageManager"/>
-                <message_argument value="TransactionPackageManager"/>
-            </message_arguments>
-        </filter>
     </resource>
     <resource path="src/org/eclipse/emf/cdo/server/ISession.java" type="org.eclipse.emf.cdo.server.ISession">
         <filter id="574619656">
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
index 1c16c02c27..f89769ee63 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
@@ -18,15 +18,16 @@ import org.eclipse.emf.cdo.common.id.CDOIDUtil;
 import org.eclipse.emf.cdo.common.model.CDOPackage;
 import org.eclipse.emf.cdo.common.model.core.CDOCorePackage;
 import org.eclipse.emf.cdo.common.model.resource.CDOResourcePackage;
+import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
 import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
-import org.eclipse.emf.cdo.internal.common.revision.CDOIDMapper;
 import org.eclipse.emf.cdo.internal.server.bundle.OM;
 import org.eclipse.emf.cdo.server.IStoreAccessor;
 import org.eclipse.emf.cdo.server.StoreThreadLocal;
 import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage;
 import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageManager;
+import org.eclipse.emf.cdo.spi.common.revision.CDOIDMapper;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta;
 
@@ -78,7 +79,7 @@ public class TransactionCommitContextImpl implements IStoreAccessor.CommitContex
 
   private ConcurrentMap<CDOIDTemp, CDOID> idMappings = new ConcurrentHashMap<CDOIDTemp, CDOID>();
 
-  private CDOIDMapper idMapper = new CDOIDMapper(idMappings);
+  private CDOReferenceAdjuster idMapper = new CDOIDMapper(idMappings);
 
   private String rollbackMessage;
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
index 2a20166ef4..c71125298f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.tests.model1.Address;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.util.CDOUtil;
 
-import org.eclipse.emf.spi.cdo.CDOObjectConflictResolver.MergeLocalChangesPerFeature;
+import org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.MergeLocalChangesPerFeature;
 
 /**
  * @author Simon McDuff
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
index 424a7efb97..618583c3d2 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
@@ -35,6 +35,7 @@ public final class OpenTransactionAction extends AbstractOpenViewAction
   protected void doRun(IProgressMonitor progressMonitor) throws Exception
   {
     CDOTransaction transaction = getSession().openTransaction();
-    // transaction.options().getConflictResolvers().add(new CDOObjectConflictResolver.MergeLocalChangesPerFeature());
+    // transaction.options().getConflictResolvers().add(new
+    // AbstractObjectConflictResolver.MergeLocalChangesPerFeature());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOConflictResolver.java
index b987c76c78..e1a40740ed 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOConflictResolver.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOConflictResolver.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.view;
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
-import org.eclipse.emf.spi.cdo.CDOObjectConflictResolver;
+import org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver;
 
 import java.util.Set;
 
@@ -39,7 +39,7 @@ public interface CDOConflictResolver
   /**
    * Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
    * <p>
-   * The implementor might want to use/extend {@link CDOObjectConflictResolver}.
+   * The implementor might want to use/extend {@link AbstractObjectConflictResolver}.
    */
   public void resolveConflicts(Set<CDOObject> conflicts);
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/CDOClientProtocol.java
index 91d0cc2daa..cbbe109448 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/CDOClientProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/CDOClientProtocol.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.cdo.transaction.CDOTimeStampContext;
 import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.emf.internal.cdo.bundle.OM;
-import org.eclipse.emf.internal.cdo.query.CDOAbstractQueryIteratorImpl;
 import org.eclipse.emf.internal.cdo.session.CDORevisionManagerImpl;
 
 import org.eclipse.net4j.signal.RemoteException;
@@ -35,6 +34,7 @@ import org.eclipse.net4j.util.concurrent.RWLockManager.LockType;
 import org.eclipse.net4j.util.om.monitor.OMMonitor;
 import org.eclipse.net4j.util.om.trace.PerfTracer;
 
+import org.eclipse.emf.spi.cdo.AbstractQueryIteratorImpl;
 import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
 import org.eclipse.emf.spi.cdo.InternalCDOObject;
 import org.eclipse.emf.spi.cdo.InternalCDOTransaction.InternalCDOCommitContext;
@@ -141,7 +141,7 @@ public class CDOClientProtocol extends CDOProtocolImpl implements CDOSessionProt
     send(new ChangeSubscriptionRequest(this, viewId, cdoIDs, subscribeMode, clear));
   }
 
-  public List<Object> query(int viewID, CDOAbstractQueryIteratorImpl<?> queryResult)
+  public List<Object> query(int viewID, AbstractQueryIteratorImpl<?> queryResult)
   {
     return send(new QueryRequest(this, viewID, queryResult));
   }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/QueryRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/QueryRequest.java
index 9ef99ed241..8cae06fecd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/QueryRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/QueryRequest.java
@@ -18,10 +18,11 @@ import org.eclipse.emf.cdo.common.util.CDOQueryQueue;
 import org.eclipse.emf.cdo.internal.common.CDOQueryInfoImpl;
 
 import org.eclipse.emf.internal.cdo.bundle.OM;
-import org.eclipse.emf.internal.cdo.query.CDOAbstractQueryIteratorImpl;
 
 import org.eclipse.net4j.util.om.trace.ContextTracer;
 
+import org.eclipse.emf.spi.cdo.AbstractQueryIteratorImpl;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,9 +36,9 @@ public class QueryRequest extends CDOClientRequest<List<Object>>
 
   private int viewID;
 
-  private CDOAbstractQueryIteratorImpl<?> queryResult;
+  private AbstractQueryIteratorImpl<?> queryResult;
 
-  public QueryRequest(CDOClientProtocol protocol, int viewID, CDOAbstractQueryIteratorImpl<?> queryResult)
+  public QueryRequest(CDOClientProtocol protocol, int viewID, AbstractQueryIteratorImpl<?> queryResult)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_QUERY);
     this.viewID = viewID;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java
index e305c5ae19..3ecf4cb446 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryCDOIDIteratorImpl.java
@@ -13,13 +13,15 @@ package org.eclipse.emf.internal.cdo.query;
 import org.eclipse.emf.cdo.common.CDOQueryInfo;
 import org.eclipse.emf.cdo.view.CDOView;
 
+import org.eclipse.emf.spi.cdo.AbstractQueryIteratorImpl;
+
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * @author Simon McDuff
  */
-public class CDOQueryCDOIDIteratorImpl<CDOID> extends CDOAbstractQueryIteratorImpl<CDOID>
+public class CDOQueryCDOIDIteratorImpl<CDOID> extends AbstractQueryIteratorImpl<CDOID>
 {
   public CDOQueryCDOIDIteratorImpl(CDOView view, CDOQueryInfo queryInfo)
   {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java
index 957e3954b7..29b8fc4c57 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.internal.cdo.util.ModelUtil;
 import org.eclipse.net4j.util.WrappedException;
 
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.spi.cdo.AbstractQueryIteratorImpl;
 import org.eclipse.emf.spi.cdo.InternalCDOObject;
 import org.eclipse.emf.spi.cdo.InternalCDOView;
 
@@ -61,7 +62,7 @@ public class CDOQueryImpl extends CDOQueryInfoImpl implements CDOQuery
   }
 
   @SuppressWarnings("unchecked")
-  protected <T> CDOAbstractQueryIteratorImpl<T> createQueryResult(Class<T> classObject)
+  protected <T> AbstractQueryIteratorImpl<T> createQueryResult(Class<T> classObject)
   {
     CDOQueryInfoImpl queryInfo = createQueryInfo();
     if (classObject.equals(CDOID.class))
@@ -74,14 +75,14 @@ public class CDOQueryImpl extends CDOQueryInfoImpl implements CDOQuery
 
   public <T> List<T> getResult(Class<T> classObject)
   {
-    CDOAbstractQueryIteratorImpl<T> queryResult = createQueryResult(classObject);
+    AbstractQueryIteratorImpl<T> queryResult = createQueryResult(classObject);
     view.getSession().getSessionProtocol().query(view.getViewID(), queryResult);
     return queryResult.asList();
   }
 
   public <T> BlockingCloseableIterator<T> getResultAsync(Class<T> classObject)
   {
-    final CDOAbstractQueryIteratorImpl<T> queryResult = createQueryResult(classObject);
+    final AbstractQueryIteratorImpl<T> queryResult = createQueryResult(classObject);
     final Exception exception[] = new Exception[1];
     Runnable runnable = new Runnable()
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java
index 5fff69f0cb..c1c729a771 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java
@@ -15,13 +15,15 @@ import org.eclipse.emf.cdo.common.CDOQueryInfo;
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.view.CDOView;
 
+import org.eclipse.emf.spi.cdo.AbstractQueryIteratorImpl;
+
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * @author Simon McDuff
  */
-public class CDOQueryResultIteratorImpl<T> extends CDOAbstractQueryIteratorImpl<T>
+public class CDOQueryResultIteratorImpl<T> extends AbstractQueryIteratorImpl<T>
 {
   public CDOQueryResultIteratorImpl(CDOView view, CDOQueryInfo queryInfo)
   {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOObjectConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java
index bdf8115591..b7fefee024 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOObjectConflictResolver.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java
@@ -49,11 +49,11 @@ import java.util.Set;
  * @author Eike Stepper
  * @since 2.0
  */
-public abstract class CDOObjectConflictResolver implements CDOConflictResolver
+public abstract class AbstractObjectConflictResolver implements CDOConflictResolver
 {
   private CDOTransaction transaction;
 
-  public CDOObjectConflictResolver()
+  public AbstractObjectConflictResolver()
   {
   }
 
@@ -140,7 +140,7 @@ public abstract class CDOObjectConflictResolver implements CDOConflictResolver
    * @author Eike Stepper
    * @since 2.0
    */
-  public static class TakeRemoteChangesThenApplyLocalChanges extends CDOObjectConflictResolver
+  public static class TakeRemoteChangesThenApplyLocalChanges extends AbstractObjectConflictResolver
   {
     public TakeRemoteChangesThenApplyLocalChanges()
     {
@@ -158,7 +158,7 @@ public abstract class CDOObjectConflictResolver implements CDOConflictResolver
    * @author Eike Stepper
    * @since 2.0
    */
-  public static abstract class ThreeWayMerge extends CDOObjectConflictResolver implements CDOAdapterPolicy
+  public static abstract class ThreeWayMerge extends AbstractObjectConflictResolver implements CDOAdapterPolicy
   {
     private ChangeSubscriptionAdapter adapter = new ChangeSubscriptionAdapter();
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOAbstractQueryIteratorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractQueryIteratorImpl.java
index 844357e718..be4594e88b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOAbstractQueryIteratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractQueryIteratorImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Simon McDuff  - initial API and implementation
  **************************************************************************/
-package org.eclipse.emf.internal.cdo.query;
+package org.eclipse.emf.spi.cdo;
 
 import org.eclipse.emf.cdo.common.CDOQueryInfo;
 import org.eclipse.emf.cdo.spi.common.AbstractQueryResult;
@@ -16,20 +16,18 @@ import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.net4j.util.concurrent.ConcurrentValue;
 
-import org.eclipse.emf.spi.cdo.InternalCDOSession;
-
 import java.util.List;
 
 /**
  * @author Simon McDuff
  */
-public abstract class CDOAbstractQueryIteratorImpl<T> extends AbstractQueryResult<T>
+public abstract class AbstractQueryIteratorImpl<T> extends AbstractQueryResult<T>
 {
   private static final int UNDEFINED_QUERY_ID = -1;
 
   private ConcurrentValue<Boolean> queryIDSet = new ConcurrentValue<Boolean>(false);
 
-  public CDOAbstractQueryIteratorImpl(CDOView view, CDOQueryInfo queryInfo)
+  public AbstractQueryIteratorImpl(CDOView view, CDOQueryInfo queryInfo)
   {
     super(view, queryInfo, UNDEFINED_QUERY_ID);
   }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
index a5db3072f9..86192d0173 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
@@ -22,13 +22,11 @@ import org.eclipse.emf.cdo.common.model.CDOPackageInfo;
 import org.eclipse.emf.cdo.common.model.CDOPackageURICompressor;
 import org.eclipse.emf.cdo.common.revision.CDOReferenceAdjuster;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.internal.common.revision.CDOIDMapper;
+import org.eclipse.emf.cdo.spi.common.revision.CDOIDMapper;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
 import org.eclipse.emf.cdo.transaction.CDOTimeStampContext;
 import org.eclipse.emf.cdo.view.CDOView;
 
-import org.eclipse.emf.internal.cdo.query.CDOAbstractQueryIteratorImpl;
-
 import org.eclipse.net4j.util.concurrent.RWLockManager.LockType;
 import org.eclipse.net4j.util.io.ExtendedDataInput;
 import org.eclipse.net4j.util.io.ExtendedDataOutput;
@@ -85,7 +83,7 @@ public interface CDOSessionProtocol
 
   public void changeSubscription(int viewId, List<CDOID> cdoIDs, boolean subscribeMode, boolean clear);
 
-  public List<Object> query(int viewID, CDOAbstractQueryIteratorImpl<?> queryResult);
+  public List<Object> query(int viewID, AbstractQueryIteratorImpl<?> queryResult);
 
   public boolean cancelQuery(int queryId);