diff --git a/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
index b018d40fd2ae3ffb2f6304ca65e51f4102852005..1e540c77a399cc1646a178c8323c43ec019237d0 100644
--- a/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
@@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
org.conqat.ide.commons.ui;bundle-version="2.7.0";visibility:=reexport,
org.conqat.ide.commons.gef;bundle-version="2.7.0",
org.eclipse.jdt.ui;bundle-version="3.6.2",
- org.unicase.emfstore;bundle-version="0.7.3",
- org.unicase.ecp.model;bundle-version="0.7.3",
- org.unicase.workspace;bundle-version="0.7.3"
+ org.eclipse.emf.emfstore.server;bundle-version="0.7.3";visibility:=reexport,
+ org.eclipse.emf.ecp.common;bundle-version="0.7.3";visibility:=reexport,
+ org.eclipse.emf.emfstore.client;bundle-version="0.7.3";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.fortiss.tooling.kernel;uses:="org.eclipse.jface.resource,org.eclipse.ui.plugin,org.osgi.framework",
diff --git a/org.fortiss.tooling.kernel/trunk/plugin.xml b/org.fortiss.tooling.kernel/trunk/plugin.xml
index 6e2f748a4e263b0ef2d2d377673348bcedcd94b0..86535e9ab1b6da163f7fe7926e0742cb498d48eb 100644
--- a/org.fortiss.tooling.kernel/trunk/plugin.xml
+++ b/org.fortiss.tooling.kernel/trunk/plugin.xml
@@ -14,13 +14,13 @@
</package>
</extension>
<extension
- point="org.unicase.emfstore.locationprovider">
+ point="org.eclipse.emf.emfstore.server.locationprovider">
<LocationProvider
providerClass="org.fortiss.tooling.kernel.internal.emfstore.EclipseWorkspaceEMFStoreLocationProvider">
</LocationProvider>
</extension>
<extension
- point="org.unicase.workspace.workspaceLocationProvider">
+ point="org.eclipse.emf.emfstore.client.workspaceLocationProvider">
<LocationProvider
providerClass="org.fortiss.tooling.kernel.internal.emfstore.EclipseWorkspaceUnicaseClientLocationProvider">
</LocationProvider>
@@ -178,7 +178,7 @@
</propertySections>
</extension>
<extension
- point="org.unicase.ecp.model.ecpModelPackage">
+ point="org.eclipse.emf.ecp.model.ecppackage">
<modelPackage
modelPackage="http://www.fortiss.org/tooling/kernel">
</modelPackage>
@@ -187,14 +187,14 @@
point="org.fortiss.tooling.kernel.modelElementHandler">
<modelElementHandler
handler="org.fortiss.tooling.kernel.internal.handler.ProjectSpaceModelElementHandler"
- modelElementClass="org.unicase.workspace.ProjectSpace">
+ modelElementClass="org.eclipse.emf.emfstore.client.model.ProjectSpace">
</modelElementHandler>
</extension>
<extension
point="org.fortiss.tooling.kernel.modelElementCompositor">
<modelElementCompositor
compositor="org.fortiss.tooling.kernel.internal.compose.ProjectSpaceCompositor"
- modelElementClass="org.unicase.workspace.ProjectSpace">
+ modelElementClass="org.eclipse.emf.emfstore.client.model.ProjectSpace">
</modelElementCompositor>
</extension>
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
index efb972e5ce2c1a2fa511615e7ca3955568f9986d..ab9df18d07841487f36d30c05e1191ac5d7490e9 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
@@ -26,15 +26,15 @@ import org.eclipse.emf.common.command.BasicCommandStack;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.model.ECPWorkspaceManager;
+import org.eclipse.emf.ecp.model.NoWorkspaceException;
+import org.eclipse.emf.ecp.model.workSpaceModel.ECPProject;
+import org.eclipse.emf.ecp.model.workSpaceModel.ECPWorkspace;
+import org.eclipse.emf.ecp.model.workSpaceModel.WorkSpaceModelPackage;
import org.eclipse.emf.edit.command.ChangeCommand;
import org.fortiss.tooling.kernel.ToolingKernelActivator;
import org.fortiss.tooling.kernel.services.ICommandStackService;
import org.fortiss.tooling.kernel.util.ProjectRootElementUtils;
-import org.unicase.ecp.model.ECPWorkspaceManager;
-import org.unicase.ecp.model.NoWorkspaceException;
-import org.unicase.ecp.model.workSpaceModel.ECPProject;
-import org.unicase.ecp.model.workSpaceModel.ECPWorkspace;
-import org.unicase.ecp.model.workSpaceModel.WorkSpaceModelPackage;
/**
* This class implements the {@link ICommandStackService} interface. We have to
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/compose/ProjectSpaceCompositor.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/compose/ProjectSpaceCompositor.java
index f65943700143afdee2589042d0966ec02f1d8222..12293e48c34f34792a5ba92a7f3ef0fd0dc357a2 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/compose/ProjectSpaceCompositor.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/compose/ProjectSpaceCompositor.java
@@ -18,10 +18,10 @@ $Id$
package org.fortiss.tooling.kernel.internal.compose;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.emfstore.client.model.ProjectSpace;
import org.fortiss.tooling.kernel.interfaces.ICompositionContext;
import org.fortiss.tooling.kernel.interfaces.ICompositor;
import org.fortiss.tooling.kernel.model.IProjectRootElement;
-import org.unicase.workspace.ProjectSpace;
/**
* {@link ICompositor} implementation for the {@link IProjectRootElement}s.
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceEMFStoreLocationProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceEMFStoreLocationProvider.java
index 2b28b289c5286bb6821eefe4184559a7cc5ff042..c46d678d1cd2a7843fe15389cf05b60154516e21 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceEMFStoreLocationProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceEMFStoreLocationProvider.java
@@ -17,7 +17,7 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.kernel.internal.emfstore;
-import org.unicase.emfstore.LocationProvider;
+import org.eclipse.emf.emfstore.server.LocationProvider;
/**
* A {@link LocationProvider} which uses the Eclipse workspace location as base
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceLocationProviderBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceLocationProviderBase.java
index d8addc971669c89f07cbf9888921fc68d71ab8df..e8f3f179e43137b761b0c9d70eeaac314b654eb6 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceLocationProviderBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceLocationProviderBase.java
@@ -21,7 +21,7 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.unicase.emfstore.LocationProvider;
+import org.eclipse.emf.emfstore.server.LocationProvider;
/**
* Base implementation of a {@link LocationProvider} which uses the Eclipse
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceUnicaseClientLocationProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceUnicaseClientLocationProvider.java
index c6c3cab547088b2a6a147173526edafcedf44c15..d2144334ebe0958828d65bc5dc277c3e6f2e3506 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceUnicaseClientLocationProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/emfstore/EclipseWorkspaceUnicaseClientLocationProvider.java
@@ -17,7 +17,7 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.kernel.internal.emfstore;
-import org.unicase.emfstore.LocationProvider;
+import org.eclipse.emf.emfstore.server.LocationProvider;
/**
* A {@link LocationProvider} which uses the Eclipse workspace location as base
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/handler/ProjectSpaceModelElementHandler.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/handler/ProjectSpaceModelElementHandler.java
index 4261cbcadd8d03d23ac579a2c15c4083ae34493d..606b2e6c46598d9dbd1821b5565c16f7027f618d 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/handler/ProjectSpaceModelElementHandler.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/handler/ProjectSpaceModelElementHandler.java
@@ -21,12 +21,12 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.emfstore.client.model.ProjectSpace;
import org.eclipse.jface.resource.ImageDescriptor;
import org.fortiss.tooling.kernel.ToolingKernelActivator;
import org.fortiss.tooling.kernel.base.HandlerBase;
import org.fortiss.tooling.kernel.interfaces.IHandler;
import org.fortiss.tooling.kernel.model.IProjectRootElement;
-import org.unicase.workspace.ProjectSpace;
/**
* {@link IHandler} for {@link ProjectSpace}s.
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java
index b65c8c64c306ae0afe7718b542f9de3a49e9106f..8444d992db933f3cb765dc460f95fc9100b43335 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java
@@ -21,12 +21,12 @@ import java.util.ArrayList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.model.workSpaceModel.ECPProject;
+import org.eclipse.emf.ecp.model.workSpaceModel.ECPWorkspace;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.fortiss.tooling.kernel.interfaces.IHandler;
import org.fortiss.tooling.kernel.services.IModelElementService;
-import org.unicase.ecp.model.workSpaceModel.ECPProject;
-import org.unicase.ecp.model.workSpaceModel.ECPWorkspace;
/**
* Content provider for the model navigator tree viewer.
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java
index aee683c188866d4664bc579464e3fb12089acfb9..1a1a753536e6e2ee44634737a7bd629f9e5a8c5d 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java
@@ -27,6 +27,12 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.model.ECPWorkspaceManager;
+import org.eclipse.emf.ecp.model.NoWorkspaceException;
+import org.eclipse.emf.ecp.model.workSpaceModel.ECPProject;
+import org.eclipse.emf.ecp.model.workSpaceModel.ECPProjectListener;
+import org.eclipse.emf.ecp.model.workSpaceModel.ECPWorkspace;
+import org.eclipse.emf.ecp.model.workSpaceModel.WorkSpaceModelPackage;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
@@ -56,12 +62,6 @@ import org.fortiss.tooling.kernel.services.IEditorService;
import org.fortiss.tooling.kernel.services.INavigatorService;
import org.fortiss.tooling.kernel.services.IPropertiesService;
import org.fortiss.tooling.kernel.util.EObjectSelectionUtils;
-import org.unicase.ecp.model.ECPWorkspaceManager;
-import org.unicase.ecp.model.NoWorkspaceException;
-import org.unicase.ecp.model.workSpaceModel.ECPProject;
-import org.unicase.ecp.model.workSpaceModel.ECPProjectListener;
-import org.unicase.ecp.model.workSpaceModel.ECPWorkspace;
-import org.unicase.ecp.model.workSpaceModel.WorkSpaceModelPackage;
/**
* {@link ViewPart} of the model navigator provided by the tooling kernel.
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java
index 5356f04db20a2fda060fd74662f164495b2a698b..8e77272ef6947a83963c27bcee48504ae8b07959 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java
@@ -20,11 +20,11 @@ package org.fortiss.tooling.kernel.util;
import org.conqat.ide.commons.ui.logging.LoggingUtils;
import org.conqat.lib.commons.reflect.ReflectionUtils;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.model.ECPWorkspaceManager;
+import org.eclipse.emf.ecp.model.workSpaceModel.ECPProject;
+import org.eclipse.emf.emfstore.client.model.ProjectSpace;
import org.fortiss.tooling.kernel.ToolingKernelActivator;
import org.fortiss.tooling.kernel.model.IProjectRootElement;
-import org.unicase.ecp.model.ECPWorkspaceManager;
-import org.unicase.ecp.model.workSpaceModel.ECPProject;
-import org.unicase.workspace.ProjectSpace;
/**
* Utility methods for accessing {@link IProjectRootElement}s.