diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server')
14 files changed, 47 insertions, 47 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java index af13f79aaa..7c722cea88 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IPackageManager.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; +import org.eclipse.emf.cdo.common.model.CDOPackageManager; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java index 10fbfd8fa6..89c5f7c7f4 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange; +import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.net4j.util.container.IContainer; @@ -49,6 +49,8 @@ public interface IRepository extends IContainer<IRepositoryElement> public IRevisionManager getRevisionManager(); + public long getLastMetaID(); + public CDOIDMetaRange getMetaIDRange(int count); /** diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java index f6cc6030e7..1be1de8c18 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IResourceManager.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOID; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java index 3966b93184..0b35992e37 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRevisionManager.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver; +import org.eclipse.emf.cdo.common.revision.CDORevisionResolver; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java index 199a2c67ef..2440591baa 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISession.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; +import org.eclipse.emf.cdo.common.CDOProtocolSession; +import org.eclipse.emf.cdo.common.CDOProtocolView; import org.eclipse.emf.cdo.internal.server.protocol.CDOServerProtocol; -import org.eclipse.emf.cdo.protocol.CDOProtocolSession; -import org.eclipse.emf.cdo.protocol.CDOProtocolView; import org.eclipse.net4j.util.container.IContainer; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java index 3d00fa14b5..6831526a3e 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java @@ -10,11 +10,11 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; +import org.eclipse.emf.cdo.common.id.CDOIDLibraryDescriptor; +import org.eclipse.emf.cdo.common.id.CDOIDLibraryProvider; +import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.internal.server.Repository; -import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor; -import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryProvider; -import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; /** * @author Eike Stepper @@ -50,8 +50,8 @@ public interface IStore extends IRepositoryElement * Returns if this store supports the retrieval of historical newRevisions. * <p> * The contract includes that store implementations with auditing support must also implement - * {@link IStoreReader#readRevisionByTime(org.eclipse.emf.cdo.protocol.CDOID, int, long) IStoreReader.readRevisionByTime(CDOID, int, long)} - * to not throw an <code>UnsupportedOperationException</code>. + * {@link IStoreReader#readRevisionByTime(org.eclipse.emf.cdo.common.CDOID, int, long) + * IStoreReader.readRevisionByTime(CDOID, int, long)} to not throw an <code>UnsupportedOperationException</code>. * * @return <code>true</code> if this store supports the retrieval of historical newRevisions, <code>false</code> * otherwise. @@ -79,13 +79,12 @@ public interface IStore extends IRepositoryElement * Returns a reader that can be used to read from this store in the context of the given session. * * @param session - * The session that should be used as a context for read access or <code>null</code>. The store - * implementor is free to interpret and use the session in a manner suitable for him or ignore it at all. It - * is meant only as a hint. Implementor can use it as a key into a cache and/or register a - * {@link org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter LifecycleEventAdapter} with it to - * intercept cleanup on session close. Note however that the session can be <code>null</code>, for example - * during startup of the server while the repositories are initialized but before any user session has been - * opened. + * The session that should be used as a context for read access or <code>null</code>. The store implementor + * is free to interpret and use the session in a manner suitable for him or ignore it at all. It is meant + * only as a hint. Implementor can use it as a key into a cache and/or register a + * {@link org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter LifecycleEventAdapter} with it to intercept + * cleanup on session close. Note however that the session can be <code>null</code>, for example during + * startup of the server while the repositories are initialized but before any user session has been opened. * @return a reader that can be used to read from this store in the context of the given session, never * <code>null</code>. */ @@ -99,8 +98,8 @@ public interface IStore extends IRepositoryElement * The view that must be used as a context for write access. The store implementor is free to interpret and * use the view in a manner suitable for him or ignore it at all. It is meant only as a hint. Implementor can * use it as a key into a cache and/or register a - * {@link org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter LifecycleEventAdapter} with it to - * intercept cleanup on view close. + * {@link org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter LifecycleEventAdapter} with it to intercept + * cleanup on view close. * @return a writer that can be used to write to this store in the context of the given view, never <code>null</code>. */ public IStoreWriter getWriter(IView view); diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java index 89cd8cbf1a..af0a905665 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java @@ -11,9 +11,9 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.revision.CDORevision; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java index 86e02a7369..ab83fab774 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java @@ -10,12 +10,12 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.model.CDOClassRef; -import org.eclipse.emf.cdo.protocol.model.CDOFeature; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.model.CDOClassRef; +import org.eclipse.emf.cdo.common.model.CDOFeature; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageInfo; +import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.net4j.util.io.CloseableIterator; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java index db8136bac8..fd163233f4 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java @@ -11,12 +11,12 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.id.CDOID; -import org.eclipse.emf.cdo.protocol.id.CDOIDTemp; -import org.eclipse.emf.cdo.protocol.model.CDOPackage; -import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; -import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDTemp; +import org.eclipse.emf.cdo.common.model.CDOPackage; +import org.eclipse.emf.cdo.common.model.CDOPackageManager; +import org.eclipse.emf.cdo.common.revision.CDORevision; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import java.util.Map; @@ -42,8 +42,8 @@ public interface IStoreWriter extends IStoreReader public interface CommitContext { /** - * Returns the ID of the transactional view (<code>ITransaction</code>) which is the scope of the commit - * operation represented by this <code>CommitContext</code>. + * Returns the ID of the transactional view (<code>ITransaction</code>) which is the scope of the commit operation + * represented by this <code>CommitContext</code>. */ public int getTransactionID(); diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java index 4c70f547f9..ecf12ce77a 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.CDOProtocolView; -import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; +import org.eclipse.emf.cdo.common.CDOProtocolView; +import org.eclipse.emf.cdo.common.model.CDOPackageManager; /** * @author Eike Stepper @@ -25,9 +25,8 @@ public interface ITransaction extends IView /** * Returns the temporary, transactional package manager associated with this ITransaction during the process of a - * commit operation. In addition to the packages registered with the session - * {@link IRepository#getPackageManager() package manager} this package manager also contains the new packages that - * are part of the commit operation. + * commit operation. In addition to the packages registered with the session {@link IRepository#getPackageManager() + * package manager} this package manager also contains the new packages that are part of the commit operation. * * @return a temporary, transactional package manager if this ITransaction is in the process of a commit operation, * <code>null</code> otherwise. diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java index bf3172a196..d39dd0cdb4 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.CDOProtocolView; +import org.eclipse.emf.cdo.common.CDOProtocolView; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java index b333f6c6e3..e14f047fa6 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.util.CDOException; +import org.eclipse.emf.cdo.common.util.CDOException; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java index 092a0404ea..f2a429cbca 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ServerConstants.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.CDOProtocolConstants; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/SessionCreationException.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/SessionCreationException.java index b0aade6771..9e31012816 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/SessionCreationException.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/SessionCreationException.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server; -import org.eclipse.emf.cdo.protocol.util.CDOException; +import org.eclipse.emf.cdo.common.util.CDOException; /** * @author Eike Stepper |