fixed dependencies
diff --git a/examples/org.eclipse.mylyn.docs.intent.retro/META-INF/MANIFEST.MF b/examples/org.eclipse.mylyn.docs.intent.retro/META-INF/MANIFEST.MF
index 4a8e39e..87e0607 100644
--- a/examples/org.eclipse.mylyn.docs.intent.retro/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.mylyn.docs.intent.retro/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@
  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.cdo;visibility:=reexport,

  org.eclipse.core.resources,

- com.google.guava,

+ com.google.guava;bundle-version="[10.0.1,11.0.0)",

  org.eclipse.mylyn.docs.intent.client.synchronizer;bundle-version="0.7.0",

  org.eclipse.ui;bundle-version="3.7.0",

  org.eclipse.mylyn.docs.intent.collab;bundle-version="0.7.0"

diff --git a/plugins/org.eclipse.mylyn.docs.intent.collab.cdo/src/org/eclipse/mylyn/docs/intent/collab/cdo/repository/CDORepository.java b/plugins/org.eclipse.mylyn.docs.intent.collab.cdo/src/org/eclipse/mylyn/docs/intent/collab/cdo/repository/CDORepository.java
index 73fba0e..10dcf97 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.collab.cdo/src/org/eclipse/mylyn/docs/intent/collab/cdo/repository/CDORepository.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.collab.cdo/src/org/eclipse/mylyn/docs/intent/collab/cdo/repository/CDORepository.java
@@ -13,10 +13,9 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.eclipse.emf.cdo.net4j.CDONet4jSession;
 import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
-import org.eclipse.emf.cdo.net4j.CDOSession;
 import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration;
+import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.ecore.EPackage.Registry;
 import org.eclipse.mylyn.docs.intent.collab.cdo.adapters.CDOAdapter;
@@ -42,27 +41,27 @@
 	/**
 	 * A constant used to identify cdo repositories.
 	 */
-	public static final String CDO_REPOSITORY_IDENTIFIER = "cdo:/";
+	public static final String CDO_REPOSITORY_IDENTIFIER = "cdo://";
 
 	/**
 	 * Connector to the repository.
 	 */
-	private static IConnector connector;
+	private IConnector connector;
 
 	/**
 	 * Container containing the connection.
 	 */
-	private static IManagedContainer container;
+	private IManagedContainer container;
 
 	/**
 	 * SessionConfiguration for the CDO repository (concrete notion).
 	 */
-	private static CDOSessionConfiguration cdoSessionConfiguration;
+	private CDOSessionConfiguration cdoSessionConfiguration;
 
 	/**
 	 * Current session connected to the repository.
 	 */
-	private static CDOSession session;
+	private CDOSession session;
 
 	/**
 	 * List of the active repositories (while not empty, we can't close the session).
@@ -82,6 +81,17 @@
 	/**
 	 * CDORepository constructor.
 	 * 
+	 * @param cdoSession
+	 *            the cdo session to use
+	 */
+	public CDORepository(CDOSession cdoSession) {
+		this.clientRegistry = new LinkedHashSet<RepositoryClient>();
+		this.session = cdoSession;
+	}
+
+	/**
+	 * CDORepository constructor.
+	 * 
 	 * @param configuration
 	 *            configuration of this CDORepository.
 	 */
@@ -120,7 +130,7 @@
 	public Object getOrCreateSession() throws RepositoryConnectionException {
 
 		// If no configuration has been created yet
-		if (cdoSessionConfiguration == null) {
+		if (cdoSessionConfiguration == null && session == null) {
 			CDOUtil.setLegacyModeDefault(true);
 			// We create this configuration
 			container = ContainerUtil.createContainer();
@@ -212,7 +222,7 @@
 	 */
 	public RepositoryAdapter createRepositoryAdapter() {
 		try {
-			return new CDOAdapter(this, (CDONet4jSession)getOrCreateSession());
+			return new CDOAdapter(this, (CDOSession)getOrCreateSession());
 		} catch (RepositoryConnectionException e) {
 			return null;
 		}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.collab.common/src/org/eclipse/mylyn/docs/intent/collab/common/internal/IntentRepositoryManagerImpl.java b/plugins/org.eclipse.mylyn.docs.intent.collab.common/src/org/eclipse/mylyn/docs/intent/collab/common/internal/IntentRepositoryManagerImpl.java
index 894e3b9..4af8d37 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.collab.common/src/org/eclipse/mylyn/docs/intent/collab/common/internal/IntentRepositoryManagerImpl.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.collab.common/src/org/eclipse/mylyn/docs/intent/collab/common/internal/IntentRepositoryManagerImpl.java
@@ -66,9 +66,9 @@
 					.getRepositoryManagerContributions().iterator(); iterator.hasNext() && repository == null;) {

 				IntentRepositoryManagerContribution repositoryManagerContribution = iterator.next();

 				if (repositoryManagerContribution.canCreateRepository(normalizedIdentifier)) {

-					repository = repositoryManagerContribution.createRepository(identifier);

+					repository = repositoryManagerContribution.createRepository(normalizedIdentifier);

 					if (repository != null) {

-						repositoriesByProject.put(repository.getIdentifier(), repository);

+						repositoriesByProject.put(normalizedIdentifier, repository);

 					}

 				}

 			}

@@ -99,6 +99,16 @@
 	}

 

 	/**

+	 * {@inheritDoc}

+	 * 

+	 * @see org.eclipse.mylyn.docs.intent.collab.common.repository.IntentRepositoryManager#register(java.lang.String, org.eclipse.mylyn.docs.intent.collab.repository.Repository)

+	 */

+	public synchronized void register(String identifier, Repository repository) {

+		String normalizedIdentifier = normalizeIdentifier(identifier);

+		repositoriesByProject.put(normalizedIdentifier, repository);

+	}

+

+	/**

 	 * Returns the normalized form of the given identifier (e.g. if identifier is of the form

 	 * platform:/resource/PROJECT_NAME/..., returns PROJECT_NAME

 	 * 

diff --git a/plugins/org.eclipse.mylyn.docs.intent.collab.common/src/org/eclipse/mylyn/docs/intent/collab/common/repository/IntentRepositoryManager.java b/plugins/org.eclipse.mylyn.docs.intent.collab.common/src/org/eclipse/mylyn/docs/intent/collab/common/repository/IntentRepositoryManager.java
index e49379a..e3b5135 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.collab.common/src/org/eclipse/mylyn/docs/intent/collab/common/repository/IntentRepositoryManager.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.collab.common/src/org/eclipse/mylyn/docs/intent/collab/common/repository/IntentRepositoryManager.java
@@ -57,4 +57,14 @@
 	 */
 	void deleteRepository(String identifier);
 
+	/**
+	 * Registers the repository with the given identifier.
+	 * 
+	 * @param identifier
+	 *            the repository identifier
+	 * @param repository
+	 *            the repository
+	 */
+	void register(String identifier, Repository repository);
+
 }
diff --git a/plugins/org.eclipse.mylyn.docs.intent.collab.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.collab.ide/META-INF/MANIFEST.MF
index af578f3..58e56ca 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.collab.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.collab.ide/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.mylyn.docs.intent.collab;visibility:=reexport,
  org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.emf.transaction;bundle-version="1.4.0";visibility:=reexport
+ org.eclipse.emf.transaction;bundle-version="1.4.0";visibility:=reexport,
+ com.google.guava;bundle-version="[10.0.1,11.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.mylyn.docs.intent.collab.ide.repository,
@@ -16,5 +17,3 @@
  org.eclipse.mylyn.docs.intent.collab.ide.utils,
  org.eclipse.mylyn.docs.intent.collab.ide.notification
 Bundle-Vendor: %providerName
-Import-Package: com.google.common.base,
- com.google.common.collect
diff --git a/tests/org.eclipse.mylyn.docs.intent.collab.test/META-INF/MANIFEST.MF b/tests/org.eclipse.mylyn.docs.intent.collab.test/META-INF/MANIFEST.MF
index b08ce0e..b9f479e 100644
--- a/tests/org.eclipse.mylyn.docs.intent.collab.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.mylyn.docs.intent.collab.test/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@
  org.eclipse.core.resources;bundle-version="3.6.0",

  org.eclipse.mylyn.docs.intent.collab.ide,

  org.eclipse.mylyn.docs.intent.client.ui.ide;bundle-version="0.7.0",

- com.google.guava

+ com.google.guava;bundle-version="[10.0.1,11.0.0)"

 Bundle-ActivationPolicy: lazy

diff --git a/tests/org.eclipse.mylyn.docs.intent.compare.test/META-INF/MANIFEST.MF b/tests/org.eclipse.mylyn.docs.intent.compare.test/META-INF/MANIFEST.MF
index a001323..277d117 100644
--- a/tests/org.eclipse.mylyn.docs.intent.compare.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.mylyn.docs.intent.compare.test/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@
  org.eclipse.mylyn.docs.intent.core;bundle-version="0.7.0",
  org.eclipse.mylyn.docs.intent.parser;bundle-version="0.7.0",
  org.eclipse.emf.compare;bundle-version="2.0.0",
- com.google.guava;bundle-version="10.0.1",
- org.eclipse.mylyn.docs.intent.compare;bundle-version="0.7.0"
+ org.eclipse.mylyn.docs.intent.compare;bundle-version="0.7.0",
+ com.google.guava;bundle-version="[10.0.1,11.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName