diff options
author | Eike Stepper | 2010-02-02 11:39:48 +0000 |
---|---|---|
committer | Eike Stepper | 2010-02-02 11:39:48 +0000 |
commit | dc758eb87d5c2f0e802e49de4ca6173d3d94a2c8 (patch) | |
tree | ee1091aac506313694923c73871275551cbc714d /plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java | |
parent | 09f6a7f80829204abd2c2bf2511ba3b4e65c81c8 (diff) | |
download | cdo-dc758eb87d5c2f0e802e49de4ca6173d3d94a2c8.tar.gz cdo-dc758eb87d5c2f0e802e49de4ca6173d3d94a2c8.tar.xz cdo-dc758eb87d5c2f0e802e49de4ca6173d3d94a2c8.zip |
[270716] Provide support for branching
https://bugs.eclipse.org/bugs/show_bug.cgi?id=270716
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java index 20ed779933..877bf82b03 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java @@ -10,6 +10,7 @@ */ package org.eclipse.emf.cdo.spi.server; +import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; import org.eclipse.emf.cdo.common.model.CDOPackageUnit; @@ -17,6 +18,7 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.server.ISessionManager; import org.eclipse.emf.cdo.server.SessionCreationException; import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; +import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch; import org.eclipse.net4j.util.security.IUserManager; @@ -45,8 +47,11 @@ public interface InternalSessionManager extends ISessionManager public void sessionClosed(InternalSession session); - public void handleCommitNotification(long timeStamp, CDOPackageUnit[] packageUnits, List<CDOIDAndVersion> dirtyIDs, - List<CDOID> detachedObjects, List<CDORevisionDelta> deltas, InternalSession excludedSession); + public void handleBranchNotification(InternalCDOBranch branch, InternalSession session); + + public void handleCommitNotification(CDOBranchPoint branchPoint, CDOPackageUnit[] packageUnits, + List<CDOIDAndVersion> dirtyIDs, List<CDOID> detachedObjects, List<CDORevisionDelta> deltas, + InternalSession excludedSession); public void handleRemoteSessionNotification(byte opcode, InternalSession excludedSession); |