From: Alessandro Boch Date: Tue, 18 Jun 2013 15:27:01 +0000 (-0700) Subject: Fix collateral caused by split of UserManager in api and implementation X-Git-Tag: releasepom-0.1.0~345^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=2c8b6cca1ced98f8ae16b8b5e9b60cfc9cfd33e5 Fix collateral caused by split of UserManager in api and implementation - Login into web UI is broken in presence of multiple controller because infinispan fails marshalling cache for ActiveUser and exception is thrown. This is because ActiveUser class is not visible, being part of user manage implementation, not being exported. - Proposed fix is to move ActiveUsers class in user manager api. Also moved respective Junit. Signed-off-by: Alessandro Boch --- diff --git a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/AuthenticatedUser.java b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java similarity index 94% rename from opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/AuthenticatedUser.java rename to opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java index f66d47ea55..94200e66e0 100644 --- a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/AuthenticatedUser.java +++ b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.usermanager.internal; +package org.opendaylight.controller.usermanager; import java.io.Serializable; import java.util.ArrayList; @@ -14,7 +14,6 @@ import java.util.Date; import java.util.List; import org.opendaylight.controller.sal.authorization.UserLevel; -import org.opendaylight.controller.usermanager.ODLUserLevel; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/AuthenticatedUserTest.java b/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java similarity index 95% rename from opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/AuthenticatedUserTest.java rename to opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java index f4810c978f..d16373c349 100644 --- a/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/AuthenticatedUserTest.java +++ b/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.usermanager.internal; +package org.opendaylight.controller.usermanager; import java.util.Arrays; import java.util.List; @@ -16,6 +16,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.controller.sal.authorization.UserLevel; +import org.opendaylight.controller.usermanager.AuthenticatedUser; import org.springframework.security.core.GrantedAuthority; public class AuthenticatedUserTest { diff --git a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java b/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java index faa6e3b96f..9d2ad05765 100644 --- a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java +++ b/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java @@ -43,6 +43,7 @@ import org.opendaylight.controller.sal.utils.ObjectReader; import org.opendaylight.controller.sal.utils.ObjectWriter; import org.opendaylight.controller.sal.utils.Status; import org.opendaylight.controller.usermanager.AuthResponse; +import org.opendaylight.controller.usermanager.AuthenticatedUser; import org.opendaylight.controller.usermanager.AuthorizationConfig; import org.opendaylight.controller.usermanager.IAAAProvider; import org.opendaylight.controller.usermanager.ISessionManager; @@ -51,7 +52,6 @@ import org.opendaylight.controller.usermanager.ServerConfig; import org.opendaylight.controller.usermanager.UserConfig; import org.opendaylight.controller.usermanager.security.SessionManager; import org.opendaylight.controller.usermanager.security.UserSecurityContextRepository; -import org.opendaylight.controller.usermanager.internal.AuthenticatedUser; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; diff --git a/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java b/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java index e8748d8200..e84396b0f4 100644 --- a/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java +++ b/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java @@ -23,6 +23,7 @@ import org.opendaylight.controller.sal.authorization.AuthResultEnum; import org.opendaylight.controller.sal.authorization.UserLevel; import org.opendaylight.controller.sal.utils.ServiceHelper; import org.opendaylight.controller.usermanager.AuthResponse; +import org.opendaylight.controller.usermanager.AuthenticatedUser; import org.opendaylight.controller.usermanager.IAAAProvider; import org.opendaylight.controller.usermanager.IUserManager; import org.opendaylight.controller.usermanager.ServerConfig;