[502067] Set UserManager as IAuthenticator to allow authentication custo

* Set the userManager as authenticator so that the authenticate
implementation can be overridden
* Keep the same default UserManager authentication delegating to
UserManagerAuthenticator
* Previously, SessionManager.setUserManager was called. It created an
authenticator and set the userManager on it. It is no longer useful
because the userManager is itself the IAuthenticator so setUserManager()
is no longer needed.

Change-Id: I342cb8afbee9af26ed49a54a9caf1555b1c9170a
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>

1 files changed, 7 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
index 0b371254b4..1c6655df45 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2013, 2015 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2011-2013, 2016 Eike Stepper (Berlin, Germany) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -272,7 +272,12 @@ public class RepositoryConfigurator
           repository.setSessionManager(sessionManager);
         }
 
-        sessionManager.setUserManager(userManager);
+        // Set the userManager as authenticator so that 
+        // the authenticate implementation can be overridden 
+        if (userManager instanceof IAuthenticator)
+        {
+          sessionManager.setAuthenticator((IAuthenticator)userManager);
+        }
       }
     }
   }