5 files changed, 10 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.workspace/src/org/eclipse/emf/cdo/ui/internal/workspace/CheckoutAction.java b/plugins/org.eclipse.emf.cdo.ui.workspace/src/org/eclipse/emf/cdo/ui/internal/workspace/CheckoutAction.java
index cd0d0a9418..5520ec398b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.workspace/src/org/eclipse/emf/cdo/ui/internal/workspace/CheckoutAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.workspace/src/org/eclipse/emf/cdo/ui/internal/workspace/CheckoutAction.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.ui.internal.workspace;
 
 import org.eclipse.emf.cdo.location.ICheckoutSource;
 import org.eclipse.emf.cdo.ui.internal.workspace.bundle.OM;
-import org.eclipse.emf.cdo.workspace.efs.CDOWorkspaceFSUtil;
+import org.eclipse.emf.cdo.workspace.efs.CDOFS;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -74,7 +74,7 @@ public class CheckoutAction implements IObjectActionDelegate
             {
               try
               {
-                CDOWorkspaceFSUtil.checkout(checkoutSource, projectName, monitor);
+                CDOFS.checkout(checkoutSource, projectName, monitor);
                 return Status.OK_STATUS;
               }
               catch (CoreException ex)
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOWorkspaceFSUtil.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java
index 972740693b..b76d224a0a 100644
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOWorkspaceFSUtil.java
+++ b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java
@@ -51,9 +51,9 @@ import java.net.URI;
 /**
  * @author Eike Stepper
  */
-public final class CDOWorkspaceFSUtil
+public final class CDOFS
 {
-  private CDOWorkspaceFSUtil()
+  private CDOFS()
   {
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
index b426195c93..4198c6c3fa 100644
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
+++ b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.util.CommitException;
 import org.eclipse.emf.cdo.view.CDOView;
 import org.eclipse.emf.cdo.workspace.CDOWorkspace;
-import org.eclipse.emf.cdo.workspace.efs.CDOWorkspaceFSUtil;
+import org.eclipse.emf.cdo.workspace.efs.CDOFS;
 
 import org.eclipse.net4j.util.WrappedException;
 import org.eclipse.net4j.util.io.IOUtil;
@@ -101,7 +101,7 @@ public final class CDOWorkspaceStore extends AbstractResourceNodeStore
   {
     try
     {
-      return CDOWorkspaceFSUtil.open(name, location);
+      return CDOFS.open(name, location);
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
index 7d2161a7ff..c36d111892 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
@@ -124,7 +124,6 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace
   public CDOWorkspaceImpl(IStore local, InternalCDOWorkspaceBase base, CDOSessionConfigurationFactory remote)
   {
     init(local, base, remote);
-    open();
     loadProperties();
   }
 
@@ -214,10 +213,6 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace
     }
   }
 
-  protected void open()
-  {
-  }
-
   public String getBranchPath()
   {
     return branchPath;
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/spi/workspace/InternalCDOWorkspace.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/spi/workspace/InternalCDOWorkspace.java
index 249e0aae70..fc26cf8b69 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/spi/workspace/InternalCDOWorkspace.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/spi/workspace/InternalCDOWorkspace.java
@@ -13,6 +13,8 @@ package org.eclipse.emf.cdo.spi.workspace;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.workspace.CDOWorkspace;
 
+import org.eclipse.emf.spi.cdo.InternalCDOSession;
+
 /**
  * @author Eike Stepper
  */
@@ -21,4 +23,6 @@ public interface InternalCDOWorkspace extends CDOWorkspace
   public InternalCDOWorkspaceBase getBase();
 
   public InternalRepository getLocalRepository();
+
+  public InternalCDOSession getLocalSession();
 }